Some extensions to better support PGP in Appsuite