diff -ur ../MUTT/mutt/PATCHES mutt/PATCHES
--- ../MUTT/mutt/PATCHES	2002-12-09 18:44:54.000000000 +0100
+++ mutt/PATCHES	2004-03-10 14:39:29.000000000 +0100
@@ -0,0 +1 @@
+patch-1.5.6.ddm.pgp-auto-decode.1
diff -ur ../MUTT/mutt/commands.c mutt/commands.c
--- ../MUTT/mutt/commands.c	2004-01-05 19:49:00.000000000 +0100
+++ mutt/commands.c	2004-03-10 14:37:48.000000000 +0100
@@ -951,6 +951,7 @@
     rv = 1;
   }
   
+  h->security |= PGP_TRADITIONAL_CHECKED;
   mx_close_message (&msg);
   return rv;
 }
diff -ur ../MUTT/mutt/curs_main.c mutt/curs_main.c
--- ../MUTT/mutt/curs_main.c	2003-09-03 19:09:09.000000000 +0200
+++ mutt/curs_main.c	2004-03-10 14:37:48.000000000 +0100
@@ -1114,7 +1114,7 @@
       case OP_DISPLAY_HEADERS: /* don't weed the headers */
 
 	CHECK_MSGCOUNT;
-        CHECK_VISIBLE;
+	CHECK_VISIBLE;
 	/*
 	 * toggle the weeding of headers so that a user can press the key
 	 * again while reading the message.
@@ -1132,6 +1132,8 @@
 	    menu->current = mutt_thread_next_unread (Context, CURHDR);
 	}
  
+	if (option (OPTPGPAUTODEC) && !(tag ? 0 : (CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+	  mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
 	if ((op = mutt_display_message (CURHDR)) == -1)
 	{
 	  unset_option (OPTNEEDRESORT);
@@ -1808,6 +1810,8 @@
 CHECK_IMAP_ACL(IMAP_ACL_INSERT);
 #endif
 
+	if (option (OPTPGPAUTODEC) && !(tag ? 0 : (CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+	  mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
         mutt_edit_message (Context, tag ? NULL : CURHDR);
 	menu->redraw = REDRAW_FULL;
 
@@ -1818,6 +1822,8 @@
 	CHECK_MSGCOUNT;
         CHECK_VISIBLE;
 	CHECK_ATTACH;
+	if (option (OPTPGPAUTODEC) && !(tag ? 0 : (CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+	  mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
 	ci_send_message (SENDFORWARD, NULL, NULL, Context, tag ? NULL : CURHDR);
 	menu->redraw = REDRAW_FULL;
 	break;
@@ -1832,6 +1838,8 @@
 	CHECK_MSGCOUNT;
         CHECK_VISIBLE;
 	CHECK_ATTACH;
+	if (option (OPTPGPAUTODEC) && !(tag ? 0 : (CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+	  mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
 	ci_send_message (SENDREPLY|SENDGROUPREPLY, NULL, NULL, Context, tag ? NULL : CURHDR);
 	menu->redraw = REDRAW_FULL;
 	break;
@@ -1841,6 +1849,8 @@
 	CHECK_ATTACH;
 	CHECK_MSGCOUNT;
         CHECK_VISIBLE;
+	if (option (OPTPGPAUTODEC) && !(tag ? 0 : (CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+	  mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
 	ci_send_message (SENDREPLY|SENDLISTREPLY, NULL, NULL, Context, tag ? NULL : CURHDR);
 	menu->redraw = REDRAW_FULL;
 	break;
@@ -1957,6 +1967,8 @@
 	CHECK_ATTACH;
 	CHECK_MSGCOUNT;
         CHECK_VISIBLE;
+	if (option (OPTPGPAUTODEC) && !(tag ? 0 : (CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+	  mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
 	ci_send_message (SENDREPLY, NULL, NULL, Context, tag ? NULL : CURHDR);
 	menu->redraw = REDRAW_FULL;
 	break;
diff -ur ../MUTT/mutt/init.h mutt/init.h
--- ../MUTT/mutt/init.h	2004-02-13 16:08:31.000000000 +0100
+++ mutt/init.h	2004-03-10 14:37:48.000000000 +0100
@@ -1452,6 +1452,17 @@
   ** This option overrides ``$$pgp_create_traditional''
   ** (PGP only)
   */
+  { "pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, 0 },
+  /*
+  ** .pp
+  ** If set, mutt will automatically attempt to decrypt traditional PGP
+  ** messages whenever the user performs an operation which ordinarily would
+  ** result in the contents of the message being operated on.  For example,
+  ** if the user displays a pgp-traditional message which has not been manually
+  ** checked with the check-traditional-pgp function, mutt will automatically
+  ** check the message for traditional pgp.
+  */
+
 
   /* XXX Default values! */
   
diff -ur ../MUTT/mutt/mutt.h mutt/mutt.h
--- ../MUTT/mutt/mutt.h	2004-02-13 16:08:32.000000000 +0100
+++ mutt/mutt.h	2004-03-10 14:37:48.000000000 +0100
@@ -444,6 +444,7 @@
   OPTPGPCHECKEXIT,
   OPTPGPLONGIDS,
   OPTPGPAUTOTRAD,
+  OPTPGPAUTODEC,
 #if 0
   OPTPGPENCRYPTSELF,
 #endif
diff -ur ../MUTT/mutt/mutt_crypt.h mutt/mutt_crypt.h
--- ../MUTT/mutt/mutt_crypt.h	2004-01-05 19:49:00.000000000 +0100
+++ mutt/mutt_crypt.h	2004-03-10 14:38:21.000000000 +0100
@@ -40,6 +40,7 @@
 
 #define APPLICATION_PGP    (1 << 7) 
 #define APPLICATION_SMIME  (1 << 8)
+#define PGP_TRADITIONAL_CHECKED (1 << 9)
 
 #define PGPENCRYPT  (APPLICATION_PGP | ENCRYPT)
 #define PGPSIGN     (APPLICATION_PGP | SIGN)