Fixes #1022
This is probably not a complete fix for #1022, but it's the best we can do in Mailman. Any remaining issues need to be addressed in the Python email library.