Improvements to the email features