SendMail Improvement