Development/mailer2

Updated to the approved second mailer.