Latest changes in mailer stuff. Review!