added mailer changes