more fixes to email