Improved e-mail templates