Improve sending email module