[TMorris] Fixing the mailer issues