Really fixed the Mailer model refactor now.