Fixing MailController