Merge branch 'rr/imap-send-unconfuse-from-line' into maint