Fixing email that is breaking on some clients