Improve Email Functionality