Email client fixes