some email cleanup