More email cleanup