more email fixing