Fix duplicate messages appearing in conversations

Fixes message duplicates appearing in a conversation when the same email appears in more than one folder (e.g. All Mail).

Fixes #934 (closed)