Merge branch 'jw/imap-preformatted-html'