#12586: Fix a small oversight in the new email policy header setting code.

This is a danger of focusing on unit tests: sometimes you forget
to do the integration tests.