Custom Email Headers were lost.

Strategy is:
Handle default headers
Remove default headers from HeaderFields
and then add all custom headers
reverse the list
so that the fields appear in the email in the same order as in the controller