Hi,

I submitted a patch a few months ago, to generate OpenPGP headers, that
seems like it was a bit faulty. When trying it out today, it didn't seem
to work properly, so I debugged it and made a few changes attached
below.

My appologies for not testing the patch thoroughly enough. I hope
everything is fixed now.