Fix Mailer app from scratch