Condensing certain header fields down to one line.

This treatment is intended to fix an issue some of our clients
are having where attachments are not being displayed in some email
clients such as certain versions of outlook and apparently something
called Incredimail.