--- traditional-pgp/PATCHES Nov 2001 19:16:52 -0000	2.4
+++ traditional-pgp/PATCHES Jan 2003 18:55:53 -0000
@@ -0,0 +1 @@
+patch-1.4.0.dw.pgp-traditional.2
--- traditional-pgp/init.h Apr 2002 13:26:56 -0000	2.143.2.7
+++ traditional-pgp/init.h Jan 2003 18:55:55 -0000
@@ -1323,4 +1323,4 @@ struct option_t MuttVars[] = {
   ** .pp
-  ** Also note that using the old-style PGP message format is \fBstrongly\fP
-  ** \fBdeprecated\fP.
+  ** Please note that this format now uses text/plain instead of application/pgp
+  ** as the content type.
   */
--- traditional-pgp/muttlib.c Mar 2002 11:29:32 -0000	2.52.2.1
+++ traditional-pgp/muttlib.c Jan 2003 18:55:55 -0000
@@ -106,4 +106,2 @@ int mutt_copy_body (FILE *fp, BODY **tgt
 
-  PARAMETER *par, **ppar;
-  
   short use_disp;
@@ -153,9 +151,3 @@ int mutt_copy_body (FILE *fp, BODY **tgt
   
-  /* copy parameters */
-  for (par = b->parameter, ppar = &b->parameter; par; ppar = &(*ppar)->next, par = par->next)
-  {
-    *ppar = mutt_new_parameter ();
-    (*ppar)->attribute = safe_strdup (par->attribute);
-    (*ppar)->value = safe_strdup (par->value);
-  }
+  mutt_copy_parameter (&b->parameter, b->parameter);
 
@@ -203,2 +195,14 @@ void mutt_free_body (BODY **p)
 }
+
+
+void mutt_copy_parameter (PARAMETER **tgt, PARAMETER *src)
+{
+  for (; src; tgt = &(*tgt)->next, src = src->next)
+  {
+    *tgt = mutt_new_parameter ();
+    (*tgt)->attribute = safe_strdup (src->attribute);
+    (*tgt)->value = safe_strdup (src->value);
+  }
+}
+
 
--- traditional-pgp/pgp.c Jan 2002 15:39:28 -0000	2.45
+++ traditional-pgp/pgp.c Jan 2003 18:55:56 -0000
@@ -1648,21 +1648,18 @@ static BODY *pgp_traditional_encryptsign
   
-  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);
+  /*
+   * preserve parameters and encoding for new body
+   */
+  mutt_copy_parameter (&b->parameter, a->parameter);
+  b->encoding = a->encoding;
 
-  b->filename = safe_strdup (pgpoutfile);
-  
-  /* The following is intended to give a clue to some completely brain-dead 
-   * "mail environments" which are typically used by large corporations.
+  /*
+   * application/pgp was withdrawn...so we encode using text/plain now
    */
+  b->type = TYPETEXT;
+  b->subtype = safe_strdup ("plain");
 
-  b->d_filename = safe_strdup ("msg.pgp");
+  b->filename = safe_strdup (pgpoutfile);
+  b->use_disp = 0;
   b->disposition = DISPINLINE;
   b->unlink   = 1;
-  b->use_disp = 1;
 
@@ -1703,6 +1700,5 @@ int pgp_protect (HEADER *msg, char *pgpk
   if ((msg->content->type == TYPETEXT) &&
-      !ascii_strcasecmp (msg->content->subtype, "plain") &&
-      ((flags & PGPENCRYPT) || (msg->content->content && msg->content->content->hibin == 0)))
+      !ascii_strcasecmp (msg->content->subtype, "plain"))
   {
-    if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1)
+    if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create a text/plain pgp message?"))) == -1)
       return -1;
--- traditional-pgp/protos.h Apr 2002 17:12:18 -0000	2.86.2.1
+++ traditional-pgp/protos.h Jan 2003 18:55:56 -0000
@@ -254,2 +254,3 @@ int mutt_compose_attachment (BODY *a);
 int mutt_copy_body (FILE *, BODY **, BODY *);
+void mutt_copy_parameter (PARAMETER **, PARAMETER *);
 int mutt_decode_save_attachment (FILE *, BODY *, char *, int, int);
--- traditional-pgp/send.c Jan 2002 22:50:59 -0000	2.77.2.1
+++ traditional-pgp/send.c Jan 2003 18:55:56 -0000
@@ -1441,3 +1441,3 @@ main_loop:
    *   independently
-   * - application/pgp.  In this case, clear_content exists independently.
+   * - text/plain (and enc/sig with pgp trad.). clear_context exists ind.
    * - something else.  In this case, it's the same as clear_content.
@@ -1567,3 +1567,3 @@ full_fcc:
       if ((msg->pgp & PGPENCRYPT) || 
-	  ((msg->pgp & PGPSIGN) && msg->content->type == TYPEAPPLICATION))
+	  ((msg->pgp & PGPSIGN) && msg->content->type == TYPETEXT))
       {
--- traditional-pgp/po/ca.po May 2002 09:31:40 -0000	1.6.2.4
+++ traditional-pgp/po/ca.po Jan 2003 18:55:58 -0000
@@ -3317,4 +3317,4 @@ msgstr "No s'ha pogut invocar PGP."
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Voleu crear un missatge �application/pgp�?"
+msgid "Create a text/plain pgp message?"
+msgstr "Voleu crear un missatge �text/plain pgp�?"
 
--- traditional-pgp/po/cs.po May 2002 09:31:40 -0000	1.75.2.3
+++ traditional-pgp/po/cs.po Jan 2003 18:55:59 -0000
@@ -3821,4 +3821,4 @@ msgstr "PGP nelze spustit."
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "vytvo�it zpr�vu typu 'application/pgp'?"
+msgid "Create a text/plain pgp message?"
+msgstr "vytvo�it zpr�vu typu 'text/plain pgp'?"
 
--- traditional-pgp/po/da.po May 2002 09:31:41 -0000	1.67.2.4
+++ traditional-pgp/po/da.po Jan 2003 18:56:00 -0000
@@ -3171,4 +3171,4 @@ msgstr "Kan ikke starte PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Lav et \"application/pgp\"-brev?"
+msgid "Create a text/plain pgp message?"
+msgstr "Lav et \"text/plain pgp\"-brev?"
 
--- traditional-pgp/po/de.po May 2002 09:31:41 -0000	1.160.2.4
+++ traditional-pgp/po/de.po Jan 2003 18:56:01 -0000
@@ -3186,4 +3186,4 @@ msgstr "Kann PGP nicht aufrufen"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Erzeuge application/pgp Nachricht (statt RFC 2015)?"
+msgid "Create a text/plain pgp message?"
+msgstr "Erzeuge text/plain pgp Nachricht (statt RFC 3156)?"
 
--- traditional-pgp/po/el.po May 2002 09:31:41 -0000	1.77.2.3
+++ traditional-pgp/po/el.po Jan 2003 18:56:02 -0000
@@ -3851,4 +3851,4 @@ msgstr "�������� ������ ��� PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "���������� ��� application/pgp ������;"
+msgid "Create a text/plain pgp message?"
+msgstr "���������� ��� text/plain pgp ������;"
 
--- traditional-pgp/po/eo.po May 2002 09:31:42 -0000	1.80.2.4
+++ traditional-pgp/po/eo.po Jan 2003 18:56:03 -0000
@@ -3174,4 +3174,4 @@ msgstr "Ne povas alvoki PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "�u krei application/pgp-mesa�on?"
+msgid "Create a text/plain pgp message?"
+msgstr "�u krei text/plain pgp-mesa�on?"
 
--- traditional-pgp/po/es.po May 2002 09:31:42 -0000	1.89.2.3
+++ traditional-pgp/po/es.po Jan 2003 18:56:05 -0000
@@ -3209,4 +3209,4 @@ msgstr "No se pudo invocar PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "�Crear un mensaje de tipo application/pgp?"
+msgid "Create a text/plain pgp message?"
+msgstr "�Crear un mensaje de tipo text/plain pgp?"
 
--- traditional-pgp/po/et.po May 2002 09:31:42 -0000	1.21.2.4
+++ traditional-pgp/po/et.po Jan 2003 18:56:06 -0000
@@ -3175,4 +3175,4 @@ msgstr "PGP k�ivitamine ei �nnestu"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Loon application/pgp teade?"
+msgid "Create a text/plain pgp message?"
+msgstr "Loon text/plain pgp teade?"
 
--- traditional-pgp/po/fr.po May 2002 09:31:43 -0000	1.108.2.4
+++ traditional-pgp/po/fr.po Jan 2003 18:56:07 -0000
@@ -3316,4 +3316,4 @@ msgstr "Impossible d'invoquer PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Cr�er un message application/pgp ?"
+msgid "Create a text/plain pgp message?"
+msgstr "Cr�er un message text/plain pgp ?"
 
--- traditional-pgp/po/gl.po May 2002 09:31:43 -0000	1.61.2.3
+++ traditional-pgp/po/gl.po Jan 2003 18:56:08 -0000
@@ -3214,4 +3214,4 @@ msgstr "Non foi posible invocar � PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "�Crear unha mensaxe aplicaci�n/pgp?"
+msgid "Create a text/plain pgp message?"
+msgstr "�Crear unha mensaxe text/plain pgp?"
 
--- traditional-pgp/po/hu.po May 2002 09:31:43 -0000	1.17.2.3
+++ traditional-pgp/po/hu.po Jan 2003 18:56:10 -0000
@@ -3304,3 +3304,3 @@ msgstr "PGP-t nem tudom megh�vni"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
+msgid "Create a text/plain pgp message?"
 msgstr ""
--- traditional-pgp/po/id.po May 2002 09:31:43 -0000	1.84.2.4
+++ traditional-pgp/po/id.po Jan 2003 18:56:11 -0000
@@ -3185,4 +3185,4 @@ msgstr "Tidak dapat menjalankan PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Buat surat application/pgp?"
+msgid "Create a text/plain pgp message?"
+msgstr "Buat surat text/plain pgp?"
 
--- traditional-pgp/po/it.po May 2002 09:31:44 -0000	1.103.2.3
+++ traditional-pgp/po/it.po Jan 2003 18:56:12 -0000
@@ -3175,4 +3175,4 @@ msgstr "Impossibile eseguire PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Creo un messaggio application/pgp?"
+msgid "Create a text/plain pgp message?"
+msgstr "Creo un messaggio text/plain pgp?"
 
--- traditional-pgp/po/ja.po May 2002 09:31:44 -0000	1.33.2.6
+++ traditional-pgp/po/ja.po Jan 2003 18:56:13 -0000
@@ -3151,4 +3151,4 @@ msgstr "PGP��ư�Ǥ��ʤ�"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "application/pgp��å�������������뤫?"
+msgid "Create a text/plain pgp message?"
+msgstr "text/plain pgp��å�������������뤫?"
 
--- traditional-pgp/po/ko.po May 2002 09:31:45 -0000	1.72.2.4
+++ traditional-pgp/po/ko.po Jan 2003 18:56:14 -0000
@@ -3174,4 +3174,4 @@ msgstr "PGP�� �������� ����"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "application/pgp ������ ������?"
+msgid "Create a text/plain pgp message?"
+msgstr "text/plain pgp ������ ������?"
 
--- traditional-pgp/po/lt.po May 2002 09:31:45 -0000	1.25.2.3
+++ traditional-pgp/po/lt.po Jan 2003 18:56:16 -0000
@@ -3217,4 +3217,4 @@ msgstr "Negaliu kviesti PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Ar sukurti application/pgp lai�k�?"
+msgid "Create a text/plain pgp message?"
+msgstr "Ar sukurti text/plain pgp lai�k�?"
 
--- traditional-pgp/po/nl.po May 2002 09:31:45 -0000	1.74.2.3
+++ traditional-pgp/po/nl.po Jan 2003 18:56:17 -0000
@@ -3176,4 +3176,4 @@ msgstr "Kan PGP niet aanroepen"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Een application/pgp bericht aanmaken?"
+msgid "Create a text/plain pgp message?"
+msgstr "Een text/plain pgp bericht aanmaken?"
 
--- traditional-pgp/po/pl.po May 2002 09:31:46 -0000	1.94.2.6
+++ traditional-pgp/po/pl.po Jan 2003 18:56:18 -0000
@@ -3187,4 +3187,4 @@ msgstr "Nie mo�na wywo�a� PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Utworzy� list/za��cznik typu application/pgp?"
+msgid "Create a text/plain pgp message?"
+msgstr "Utworzy� list/za��cznik typu text/plain pgp?"
 
--- traditional-pgp/po/pt_BR.po May 2002 09:31:46 -0000	1.58.2.4
+++ traditional-pgp/po/pt_BR.po Jan 2003 18:56:19 -0000
@@ -3245,4 +3245,4 @@ msgstr "N�o foi poss�vel executar o PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Criar uma mensagem application/pgp?"
+msgid "Create a text/plain pgp message?"
+msgstr "Criar uma mensagem text/plain pgp?"
 
--- traditional-pgp/po/ru.po May 2002 09:31:46 -0000	1.129.2.7
+++ traditional-pgp/po/ru.po Jan 2003 18:56:20 -0000
@@ -3202,4 +3202,4 @@ msgstr "�� ������� ��������� ��������� P
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "������� ��������� ���� application/pgp?"
+msgid "Create a text/plain pgp message?"
+msgstr "������� ��������� ���� text/plain pgp?"
 
--- traditional-pgp/po/sk.po May 2002 09:31:48 -0000	1.66.2.3
+++ traditional-pgp/po/sk.po Jan 2003 18:56:22 -0000
@@ -3260,3 +3260,3 @@ msgstr ""
 #, fuzzy
-msgid "Create an application/pgp message?"
+msgid "Create a text/plain pgp message?"
 msgstr "vytvori� z�stupcu z odosielate�a spr�vy"
--- traditional-pgp/po/sv.po May 2002 09:31:48 -0000	1.80.2.5
+++ traditional-pgp/po/sv.po Jan 2003 18:56:23 -0000
@@ -3184,4 +3184,4 @@ msgstr "Kan inte starta PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "Skapa ett meddelande av typ 'application/pgp'?"
+msgid "Create a text/plain pgp message?"
+msgstr "Skapa ett meddelande av typ 'text/plain pgp'?"
 
--- traditional-pgp/po/tr.po May 2002 09:31:49 -0000	1.25.2.3
+++ traditional-pgp/po/tr.po Jan 2003 18:56:24 -0000
@@ -3196,4 +3196,4 @@ msgstr "PGP �al��t�r�lam�yor"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "application/pgp iletisi yarat�ls�n m�?"
+msgid "Create a text/plain pgp message?"
+msgstr "text/plain pgp iletisi yarat�ls�n m�?"
 
--- traditional-pgp/po/uk.po May 2002 09:31:50 -0000	1.84.2.4
+++ traditional-pgp/po/uk.po Jan 2003 18:56:25 -0000
@@ -3142,4 +3142,4 @@ msgstr "�� ������ ��������� PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "�������� application/pgp ����?"
+msgid "Create a text/plain pgp message?"
+msgstr "�������� text/plain pgp ����?"
 
--- traditional-pgp/po/zh_CN.po May 2002 09:31:51 -0000	1.14.2.3
+++ traditional-pgp/po/zh_CN.po Jan 2003 18:56:26 -0000
@@ -3257,4 +3257,4 @@ msgstr "����ִ�� PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "����һ�� application/pgp ���ż���"
+msgid "Create a text/plain pgp message?"
+msgstr "����һ�� text/plain pgp ���ż���"
 
--- traditional-pgp/po/zh_TW.po May 2002 09:31:51 -0000	1.11.2.3
+++ traditional-pgp/po/zh_TW.po Jan 2003 18:56:27 -0000
@@ -3198,4 +3198,4 @@ msgstr "不能執行 PGP"
 #: pgp.c:1707
-msgid "Create an application/pgp message?"
-msgstr "建立一封 application/pgp 的信件？"
+msgid "Create a text/plain pgp message?"
+msgstr "建立一封 text/plain pgp 的信件？"