Python's builtin mailbox parser can do this more efficiently, I think
fixing Auditing Fernando -- just testing the new patch
Merge branch 'npdoty-mailbox-parse-1'