another harassment email design tweak
Merge branch 'emailtweaks'