Work in progress on MailController.