More email fixes