mail template improvement