S2 Enhancement-  Adds mailer layout