Mail template improvements