Added some mailer stuff