Final polishing to the mail template