some changes for mailer