mail template improvements