More email edits