diff -ru mutt-1.5.4/PATCHES mutt-1.5.4.new/PATCHES
--- mutt-1.5.4/PATCHES	2003-03-19 16:33:37.000000000 -0500
+++ mutt-1.5.4.new/PATCHES	2003-08-10 15:18:22.000000000 -0400
@@ -0,0 +1 @@
+patch-1.5.4.ddm.crypt-menu.1
diff -ru mutt-1.5.4/compose.c mutt-1.5.4.new/compose.c
--- mutt-1.5.4/compose.c	2003-03-04 02:49:43.000000000 -0500
+++ mutt-1.5.4.new/compose.c	2003-08-10 15:21:07.000000000 -0400
@@ -162,15 +162,15 @@
   if (!(WithCrypto & APPLICATION_PGP))
     return msg->security;
 
-  switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-			     _("esabf")))
+  switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "),
+			     _("esabc")))
   {
   case 1: /* (e)ncrypt */
-    msg->security |= PGPENCRYPT;
+    msg->security = PGPENCRYPT;
     break;
 
   case 2: /* (s)ign */
-    msg->security |= PGPSIGN;
+    msg->security = PGPSIGN;
     break;
 
   case 3: /* sign (a)s */
@@ -200,7 +200,7 @@
     msg->security = PGPENCRYPT | PGPSIGN;
     break;
 
-  case 5: /* (f)orget it */
+  case 5: /* (c)lear */
     msg->security = 0;
     break;
   }