Don't report PGP signature could not be verified unless there really is

a signature verification problem (not some other PGP error).

diff --git a/commands.c b/commands.c
index db28ff47f9f4b23b1e91a5869ca53514a04f056b..472796411167c9bc72fc01c125c3fa9c0f909cbd 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -200,7 +200,7 @@ int mutt_display_message (HEADER *cur)
        mutt_message (_("PGP signature successfully verified."));
       else if (cur->security & PARTSIGN)
        mutt_message (_("Warning: Part of this message has not been signed."));
-      else
+      else if (cur->security & SIGN)
        mutt_message (_("PGP signature could NOT be verified."));
     }
 

diff --git a/pgp.c b/pgp.c
index 17c3d17a9a7c075b17891fe2d4b55196e8c54ec8..09beab5a18d32f47675fa3b170e529788ef8a58a 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -916,7 +916,11 @@ void pgp_encrypted_handler (BODY *a, STATE *s)
     }
 
     mutt_free_body (&tattach);
+    /* clear 'Invoking...' message, since there's no error */
+    mutt_clear_error ();
   }
+  else
+    mutt_error _("Could not decrypt PGP message");
 
   fclose (fpout);
   mutt_unlink(tempfile);