fixed mailer stuff