Fix MailScanner / MailWatch auto-commit annoyance