Merge branch 'bc/imap-send-doc' into jch