Merge branch 'mh/unify-xml-in-imap-send-and-http-push'