changes for mailer