Improve email sender