Possible mailer fix II