Email Functionality Fixes