mailer fix 3