Merge branch 'tj/maint-imap-send-remove-unused'