better email munging