mailer final fixes