E-mail template tweaks