Fix Flag element handling on updates (again).

There was still an issue with that. In case when flagged message was
read on a device the read status was updated but also the flag was removed.