more mailer edits