I recently fixed this problem with:
https://github.com/discourse/discourse/pull/37125
Is this email (assuming it’s one that did not get mangled by Discourse) something you can pass to me so that we can investigate further and possibly use it as a test case?