More email fixes mostly