Tweaked MailController.