Updated Email-Boilerplate