Enhancement of mail templates