Also permit for "action" and "x-action" on the receiving end, just

in case we can settle on a joint standard with other MUA developers.

diff --git a/pgp.c b/pgp.c
index 920ebd05ec5975261435dbb221071d05bf76796b..32ed90c8713aaf858ed87d4ef5cc36704d55b513 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -544,8 +544,10 @@ int mutt_is_application_pgp (BODY *m)
   }
   else if (m->type == TYPETEXT && ascii_strcasecmp ("plain", m->subtype) == 0)
   {
-    if ((p = mutt_get_parameter ("x-mutt-action", m->parameter)) &&
-       !ascii_strcasecmp ("pgp-sign", p))
+    if (((p = mutt_get_parameter ("x-mutt-action", m->parameter))
+        || (p = mutt_get_parameter ("x-action", m->parameter)) 
+        || (p = mutt_get_parameter ("action", m->parameter)))
+        && !ascii_strcasecmp ("pgp-sign", p))
       t |= PGPSIGN;
     else if (p && !ascii_strcasecmp ("pgp-encrypt", p))
       t |= PGPENCRYPT;