Begin fixing flash messages and mailer