Merge branch 'nd/imap-send-typofix'