added some new mailer stuff