Merge branch 'mh/imap-send-shrinkage'