More fixes to broken emails