Ameliorate bulk email sorting nightmare caused by 759256323f3b and 15a272bcc705.
Merge pull request #758 from kmaglione/email-mess

Ameliorate bulk email sorting nightmare caused by 759256323f3b and 15a27...