minor fixes to email modules