email from header improvement
email template improvements