some email fixes