**Steps to reproduce:** - Set `Settings > Email > Email list grouping` to "Group by conversation". - Open a conversation that has mails in different folders. - Trash or move the conversation, then undo the move. - See that undo action moves conversation mails to the current folder rather than back to their original folders.