mailer fix2