added more fixes to Email