Additional email fixes