Merge branch 'ew/send-email-mutt-alias-fix' into maint