rolling back mailer fix