Improved flagging of mails

Flags were removed if a mail is answered twice. This behaviour is
fixed now.