Updated SendMail plugin