reorganize and attach X-PGP-Key