-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message

diff -ur mutt-1.3.15.orig/init.h mutt-1.3.15/init.h
--- mutt-1.3.15.orig/init.h	Mon Feb 12 08:54:57 2001
+++ mutt-1.3.15/init.h	Sat Feb 24 18:03:32 2001
@@ -1227,6 +1227,13 @@
   ** \fBdeprecated\fP.
   */
 
+  { "pgp_outlook_compat", DT_QUAD, R_NONE, OPT_PGPOUTLOOK, M_NO },
+  /*
+  ** .pp
+  ** If pgp_create_traditional is defined above, this option causes mutt
+  ** to generate messages readable by users of MS Outlook using PGP.
+  */
+
   /* XXX Default values! */
   
   { "pgp_decode_command", 	DT_STR, R_NONE, UL &PgpDecodeCommand, 0},
diff -ur mutt-1.3.15.orig/mutt.h mutt-1.3.15/mutt.h
--- mutt-1.3.15.orig/mutt.h	Mon Feb 12 08:52:29 2001
+++ mutt-1.3.15/mutt.h	Sat Feb 24 18:05:56 2001
@@ -249,7 +249,9 @@
 #ifdef HAVE_PGP
   OPT_VERIFYSIG,      /* verify PGP signatures */
   OPT_PGPTRADITIONAL, /* create old-style PGP messages */
+  OPT_PGPOUTLOOK,     /* Create even older broken outlook compatible messages */
 #endif
+
 
   OPT_PRINT,
   OPT_INCLUDE,
diff -ur mutt-1.3.15.orig/pgp.c mutt-1.3.15/pgp.c
--- mutt-1.3.15.orig/pgp.c	Mon Feb 12 08:55:21 2001
+++ mutt-1.3.15/pgp.c	Sat Feb 24 18:11:40 2001
@@ -1501,12 +1501,20 @@
   
   b->encoding = ENC7BIT;
 
-  b->type = TYPEAPPLICATION;
-  b->subtype = safe_strdup ("pgp");
-
-  mutt_set_parameter ("format", "text", &b->parameter);
-  mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
-		      &b->parameter);
+  /* Outlook seems to work by scanning the message itself for PGP information, */
+  /* not the headers.  If the headers are anything but text/plain, it will */
+  /* not recognize the message. */
+  if (flags & PGPOUTLOOK) {
+    b->type = TYPETEXT;
+    b->subtype = safe_strdup ("plain");
+  } else {
+    b->type = TYPEAPPLICATION;
+    b->subtype = safe_strdup ("pgp");
+
+    mutt_set_parameter ("format", "text", &b->parameter);
+    mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
+		        &b->parameter);
+  }
 
   b->filename = safe_strdup (pgpoutfile);
   
@@ -1559,8 +1567,13 @@
   {
     if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1)
       return -1;
-    else if (i == M_YES)
+    else if (i == M_YES) {
       traditional = 1;
+    if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1)
+      return -1;
+    else if (i == M_YES)
+      flags |= PGPOUTLOOK;
+    }
   }
 
   mutt_message _("Invoking PGP...");
diff -ur mutt-1.3.15.orig/pgplib.h mutt-1.3.15/pgplib.h
--- mutt-1.3.15.orig/pgplib.h	Mon Feb 12 08:56:00 2001
+++ mutt-1.3.15/pgplib.h	Sat Feb 24 18:12:25 2001
@@ -23,6 +23,7 @@
 #define PGPSIGN     (1 << 1)
 #define PGPKEY      (1 << 2)
 #define PGPGOODSIGN (1 << 3)
+#define PGPOUTLOOK   (1 << 4)
 
 #define KEYFLAG_CANSIGN 		(1 <<  0)
 #define KEYFLAG_CANENCRYPT 		(1 <<  1)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE6mGu/T4maTv/jA10RAs5IAJ49405O6PDj0Rd4ff5BBy5CII0JgACfRILp
07YD7eWOc/cRnqK8mzSDMis=
=BZwl
-----END PGP SIGNATURE-----