Further email fixes