More mailer edits