mailer fix #2