Documentation (Ticket #13373)
Fix color popup when editing flags in basic view
[mms] Fix resuming draft from mailbox page in basic view.

Conflicts:
	imp/docs/CHANGES
	imp/package.xml
Fix returning Image object from the flag hostname driver
E-mail search performance tuning got lost when I refactored
Fix setting uidvalidity in draft URL data