Merged Mailer Branch