Move PGP messages to PGP template
Rebuild HTML