Merge branch 'jc/mailsplit-warn-on-tty'