Improved mail template