This change breaks all kinds of things, e.g. - deleting messages - updating messages - downloading attachments - deleting attachments - searching in message bodies
Fixed lots of conflicts