Improve send mail