Merge branch 'nm/imap-send-quote-server-folder-name'