IIRC, I tried the OP's patch and it broke too many of the email package's test suite.  I made an attempt at fixing the problem to be much more RFC compliant, but couldn't get the test suite to pass completely.  This points to a much deeper problem with email package header management.  I don't think the problem is a bug, I think it's a design flaw.