more email fixes