Enhance the email sender