Merge branch 'bc/imap-send-doc'