More changes to PgpSignEncrypt