Misc. minor PGP/MIME fixes
Reorder displayed headers, add CC