--- pgp-menu-traditional/PATCHES Nov 2001 19:16:52 -0000	2.4
+++ pgp-menu-traditional/PATCHES Apr 2003 10:31:02 -0000
@@ -0,0 +1 @@
+patch-1.4.1.dw.pgp-menu-traditional.1
--- pgp-menu-traditional/compose.c Jul 2002 08:41:29 -0000	2.48.2.1
+++ pgp-menu-traditional/compose.c Apr 2003 10:31:02 -0000
@@ -119,2 +119,6 @@ static void redraw_pgp_lines (int pgp)
     addstr (_("Clear"));
+
+  if (pgp & PGPINLINE)
+    addstr (_(" (inline)"));
+
   clrtoeol ();
@@ -132,4 +136,4 @@ static int pgp_send_menu (int bits, int 
 
-  switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-			     _("esabf")))
+  switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "),
+			     _("esabtf")))
   {
@@ -166,6 +170,11 @@ static int pgp_send_menu (int bits, int 
   case 4: /* (b)oth */
-    bits = PGPENCRYPT | PGPSIGN;
+    bits |= PGPENCRYPT | PGPSIGN;
     break;
 
-  case 5: /* (f)orget it */
+  case 5: /* (t)raditional inline */
+    if ((bits & (PGPENCRYPT | PGPSIGN)))
+      bits |= PGPINLINE;
+    break;
+
+  case 6: /* (f)orget it */
     bits = 0;
--- pgp-menu-traditional/init.h Jul 2002 08:41:29 -0000	2.143.2.11
+++ pgp-menu-traditional/init.h Apr 2003 10:31:03 -0000
@@ -1261,2 +1261,43 @@ struct option_t MuttVars[] = {
   */
+  { "pgp_create_traditional",	DT_SYN, R_NONE, UL "pgp_autoinline", 0 },
+  { "pgp_autoinline",		DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0 },
+  /*
+  ** .pp
+  ** This option controls whether Mutt generates old-style inline
+  ** (traditional) PGP encrypted or signed messages under certain
+  ** circumstances.  This can be overridden by use of the \fIpgp-menu\fP,
+  ** when inline is not required.
+  ** .pp
+  ** Note that Mutt might automatically use PGP/MIME for messages
+  ** which consist of more than a single MIME part.  Mutt can be
+  ** configured to ask before sending PGP/MIME messages when inline
+  ** (traditional) would not work.
+  ** See also: ``$$pgp_mime_ask''.
+  ** .pp
+  ** Also note that using the old-style PGP message format is \fBstrongly\fP
+  ** \fBdeprecated\fP.
+  ** (PGP only)
+  */
+  { "pgp_replyinline",		DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0 },
+  /*
+  ** .pp
+  ** Setting this variable will cause Mutt to always attempt to
+  ** create an inline (traditional) message when replying to a
+  ** message which is PGP encrypted/signed inline.  This can be
+  ** overridden by use of the \fIpgp-menu\fP, when inline is not
+  ** required.  This option does not automatically detect if the
+  ** (replied-to) message is inline; instead it relies on Mutt
+  ** internals for previously checked/flagged messages.
+  ** .pp
+  ** Note that Mutt might automatically use PGP/MIME for messages
+  ** which consist of more than a single MIME part.  Mutt can be
+  ** configured to ask before sending PGP/MIME messages when inline
+  ** (traditional) would not work.
+  ** See also: ``$$pgp_mime_ask''.
+  ** .pp
+  ** Also note that using the old-style PGP message format is \fBstrongly\fP
+  ** \fBdeprecated\fP.
+  ** (PGP only)
+  ** 
+  */
   { "pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1 },
@@ -1313,14 +1354,11 @@ struct option_t MuttVars[] = {
   */
-  { "pgp_create_traditional", DT_QUAD, R_NONE, OPT_PGPTRADITIONAL, M_NO },
+  { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, M_NO },
   /*
   ** .pp
-  ** This option controls whether Mutt generates old-style PGP encrypted
-  ** or signed messages under certain circumstances.
-  ** .pp
-  ** Note that PGP/MIME will be used automatically for messages which have
-  ** a character set different from us-ascii, or which consist of more than
-  ** a single MIME part.
+  ** This option controls whether Mutt will prompt you for
+  ** automatically sending a (signed/encrypted) message using
+  ** PGP/MIME when inline (traditional) fails (for any reason).
   ** .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.
   */
--- pgp-menu-traditional/mutt.h Jul 2002 09:46:58 -0000	2.111.2.2
+++ pgp-menu-traditional/mutt.h Apr 2003 10:31:03 -0000
@@ -264,3 +264,3 @@ enum
   OPT_VERIFYSIG,      /* verify PGP signatures */
-  OPT_PGPTRADITIONAL, /* create old-style PGP messages */
+  OPT_PGPMIMEASK,     /* ask to revert to PGP/MIME when inline fails */
 #endif
@@ -441,2 +441,4 @@ enum
   /* pseudo options */
+  OPTPGPAUTOINLINE,
+  OPTPGPREPLYINLINE,
 
@@ -623,3 +625,3 @@ typedef struct header
 #ifdef HAVE_PGP
-  unsigned int pgp : 4;
+  unsigned int pgp : 5;
 #endif
--- pgp-menu-traditional/muttlib.c Mar 2002 11:29:32 -0000	2.52.2.1
+++ pgp-menu-traditional/muttlib.c Apr 2003 10:31:03 -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);
+  }
+}
+
 
--- pgp-menu-traditional/pgp.c Jan 2002 15:39:28 -0000	2.45
+++ pgp-menu-traditional/pgp.c Apr 2003 10:31:03 -0000
@@ -603,2 +603,17 @@ 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))
+	 || (p = mutt_get_parameter ("x-action", m->parameter))
+	 || (p = mutt_get_parameter ("action", m->parameter)))
+	 && !ascii_strncasecmp ("pgp-sign", p, 8))
+      t |= PGPSIGN;
+    else if (p && !ascii_strncasecmp ("pgp-encrypt", p, 11))
+      t |= PGPENCRYPT;
+    else if (p && !ascii_strncasecmp ("pgp-keys", p, 8))
+      t |= PGPKEY;
+  }
+  if (t)
+    t |= PGPINLINE;
+
   return t;
@@ -1333,3 +1348,3 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS
   int i;
-  pgp_key_t *k_info, *key;
+  pgp_key_t *k_info, *key = NULL;
 
@@ -1648,21 +1663,21 @@ static BODY *pgp_traditional_encryptsign
   
-  b->encoding = ENC7BIT;
-
-  b->type = TYPEAPPLICATION;
-  b->subtype = safe_strdup ("pgp");
+  /*
+   * preserve parameters and encoding for new body
+   */
+  mutt_copy_parameter (&b->parameter, a->parameter);
+  b->encoding = a->encoding;
 
-  mutt_set_parameter ("format", "text", &b->parameter);
-  mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
+  mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "pgp-encrypted" : "pgp-signed",
 		      &b->parameter);
 
-  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;
 
@@ -1702,10 +1717,6 @@ 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)))
+  if ((msg->pgp & PGPINLINE))
   {
-    if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1)
-      return -1;
-    else if (i == M_YES)
-      traditional = 1;
+    /* they really want to send it inline... go for it */
+    traditional = 1;
   }
@@ -1719,7 +1730,14 @@ int pgp_protect (HEADER *msg, char *pgpk
   {
-    if (!(pbody = pgp_traditional_encryptsign (msg->content, flags, pgpkeylist)))
+    pbody = pgp_traditional_encryptsign (msg->content, flags, pgpkeylist);
+    if (pbody)
+    {
+      msg->content = pbody;
+      return 0;
+    }
+
+    /* otherwise inline won't work...ask for revert */
+    if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline.  Revert to using PGP/MIME?"))) != M_YES)
       return -1;
     
-    msg->content = pbody;
-    return 0;
+    /* go ahead with PGP/MIME */
   }
--- pgp-menu-traditional/pgplib.h Jun 2001 10:25:39 -0000	2.10
+++ pgp-menu-traditional/pgplib.h Apr 2003 10:31:03 -0000
@@ -25,2 +25,3 @@
 #define PGPGOODSIGN (1 << 3)
+#define PGPINLINE   (1 << 4)
 
--- pgp-menu-traditional/postpone.c Oct 2001 09:20:38 -0000	2.30
+++ pgp-menu-traditional/postpone.c Apr 2003 10:31:03 -0000
@@ -445,2 +445,7 @@ int mutt_parse_pgp_hdr (char *p, int set
 	  
+      case 'i':
+      case 'I':
+	pgp |= PGPINLINE;
+	break;
+
       default:
--- pgp-menu-traditional/protos.h Apr 2002 17:12:18 -0000	2.86.2.1
+++ pgp-menu-traditional/protos.h Apr 2003 10:31:03 -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);
--- pgp-menu-traditional/send.c Jan 2002 22:50:59 -0000	2.77.2.1
+++ pgp-menu-traditional/send.c Apr 2003 10:31:03 -0000
@@ -1029,8 +1029,10 @@ static int _set_pgp_flags (HEADER *cur)
   
-  if (option (OPTPGPREPLYENCRYPT) && cur && cur->pgp & PGPENCRYPT)
+  if (option (OPTPGPREPLYENCRYPT) && cur && (cur->pgp & PGPENCRYPT))
     flags |= PGPENCRYPT;
-  if (option (OPTPGPREPLYSIGN) && cur && cur->pgp & PGPSIGN)
+  if (option (OPTPGPREPLYSIGN) && cur && (cur->pgp & PGPSIGN))
     flags |= PGPSIGN;
-  if (option (OPTPGPREPLYSIGNENCRYPTED) && cur && cur->pgp & PGPENCRYPT)
+  if (option (OPTPGPREPLYSIGNENCRYPTED) && cur && (cur->pgp & PGPENCRYPT))
     flags |= PGPSIGN;
+  if (option (OPTPGPREPLYINLINE) && cur && (cur->pgp & PGPINLINE))
+    flags |= PGPINLINE;
 
@@ -1253,3 +1255,5 @@ ci_send_message (int flags,		/* send mod
 	msg->pgp |= PGPENCRYPT;
-      
+      if (option (OPTPGPAUTOINLINE))
+	msg->pgp |= PGPINLINE;
+
       msg->pgp |= set_pgp_flags (cur, ctx);
@@ -1441,3 +1445,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 +1571,3 @@ full_fcc:
       if ((msg->pgp & PGPENCRYPT) || 
-	  ((msg->pgp & PGPSIGN) && msg->content->type == TYPEAPPLICATION))
+	  ((msg->pgp & PGPSIGN) && msg->content->type == TYPETEXT))
       {
--- pgp-menu-traditional/sendlib.c May 2002 16:59:39 -0000	2.94.2.5
+++ pgp-menu-traditional/sendlib.c Apr 2003 10:31:03 -0000
@@ -2373,2 +2373,4 @@ int mutt_write_fcc (const char *path, HE
     }
+    if (hdr->pgp & PGPINLINE)
+      fputc ('I', msg->fp);
     fputc ('\n', msg->fp);
--- pgp-menu-traditional/po/ca.po Mar 2003 22:18:36 -0000	1.6.2.7
+++ pgp-menu-traditional/po/ca.po Apr 2003 10:31:04 -0000
@@ -566,10 +566,10 @@ msgstr "<per defecte>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, o en (c)lar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "(x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, traditional en (l)�nia, o en (c)lar? "
 
 # ivb (2001/11/19)
-# ivb  (x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, (c)lar
+# ivb  (x)ifra, (s)igna, s(i)gna com a, (a)mbd�s, traditional en (l)�nia, o en (c)lar
 #: compose.c:134
-msgid "esabf"
-msgstr "xsiac"
+msgid "esabtf"
+msgstr "xsialc"
 
@@ -3318,4 +3318,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�?"
 
--- pgp-menu-traditional/po/cs.po Mar 2003 22:18:36 -0000	1.75.2.5
+++ pgp-menu-traditional/po/cs.po Apr 2003 10:31:04 -0000
@@ -644,4 +644,4 @@ msgstr "<implicitn�>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(�)ifrovat, (p)odepsat, podepsat (j)ako, (o)boj�, �i (n)ic?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "(�)ifrovat, (p)odepsat, podepsat (j)ako, (o)boj�, (t)raditional/p��m�, �i (n)ic?"
 
@@ -649,4 +649,4 @@ msgstr "(�)ifrovat, (p)odepsat, podepsat
 #: compose.c:134
-msgid "esabf"
-msgstr "�pjon"
+msgid "esabtf"
+msgstr "�pjotn"
 
@@ -3823,4 +3823,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'?"
 
--- pgp-menu-traditional/po/da.po Mar 2003 22:18:37 -0000	1.67.2.6
+++ pgp-menu-traditional/po/da.po Apr 2003 10:31:04 -0000
@@ -536,8 +536,8 @@ msgstr "<forvalgt>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(k)rypt�r, (u)nderskriv, underskriv (s)om, (b)egge, (i)ngen PGP"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "(k)rypt�r, (u)nderskriv, underskriv (s)om, (b)egge, (t)raditional integreret, (i)ngen PGP"
 
 #: compose.c:134
-msgid "esabf"
-msgstr "kusbi"
+msgid "esabtf"
+msgstr "kusbti"
 
@@ -3173,4 +3173,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?"
 
--- pgp-menu-traditional/po/de.po Mar 2003 22:18:37 -0000	1.160.2.6
+++ pgp-menu-traditional/po/de.po Apr 2003 10:31:05 -0000
@@ -534,8 +534,8 @@ msgstr "<Voreinstellung>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(v)erschl., (s)ign., sign. (a)ls, (b)eides, (k)ein PGP"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (t)raditionelles Inline, (k)ein PGP? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "vsabk"
+msgid "esabtf"
+msgstr "vsabtk"
 
@@ -3188,4 +3188,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)?"
 
--- pgp-menu-traditional/po/el.po Mar 2003 22:18:37 -0000	1.77.2.5
+++ pgp-menu-traditional/po/el.po Apr 2003 10:31:05 -0000
@@ -661,4 +661,4 @@ msgstr "<��'�������>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(e)ncrypt, (s)ign, sign (a)s, (b)oth, � (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional �������, � (f)orget it? "
 
@@ -667,4 +667,4 @@ msgstr "(e)ncrypt, (s)ign, sign (a)s, (b
 #: compose.c:134
-msgid "esabf"
-msgstr "esabf"
+msgid "esabtf"
+msgstr "esabtf"
 
@@ -3853,4 +3853,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 ������;"
 
--- pgp-menu-traditional/po/eo.po Mar 2003 22:18:37 -0000	1.80.2.6
+++ pgp-menu-traditional/po/eo.po Apr 2003 10:31:05 -0000
@@ -536,8 +536,8 @@ msgstr "<implicite>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "�(i)fri, (s)ubskribi, subskribi (k)iel, (a)mba�, a� (f)orgesi? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "�(i)fri, (s)ubskribi, subskribi (k)iel, (a)mba�, (t)raditional \"inline\", a� (f)orgesi? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "iskaf"
+msgid "esabtf"
+msgstr "iskatf"
 
@@ -3176,4 +3176,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?"
 
--- pgp-menu-traditional/po/es.po Mar 2003 22:18:37 -0000	1.89.2.5
+++ pgp-menu-traditional/po/es.po Apr 2003 10:31:05 -0000
@@ -534,8 +534,8 @@ msgstr "<por defecto>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "�co(d)ificar, f(i)rmar (c)omo, amb(o)s o ca(n)celar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "�co(d)ificar, f(i)rmar (c)omo, amb(o)s, (t)radicional incluido, o ca(n)celar? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "dicon"
+msgid "esabtf"
+msgstr "dicotn"
 
@@ -3211,4 +3211,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?"
 
--- pgp-menu-traditional/po/et.po Mar 2003 22:18:38 -0000	1.21.2.6
+++ pgp-menu-traditional/po/et.po Apr 2003 10:31:06 -0000
@@ -534,8 +534,8 @@ msgstr "<vaikimisi>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(k)r�pti, (a)llkiri, allk. ku(i), (m)�lemad v�i (u)nusta? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditinal inline, or (f)orget it? "
+msgstr "PGP (k)r�pti, (a)llkiri, allk. ku(i), (m)�lemad, (t)raditional kehasse, v�i (u)nusta? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "kaimu"
+msgid "esabtf"
+msgstr "kaimtu"
 
@@ -3177,4 +3177,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?"
 
--- pgp-menu-traditional/po/fr.po Mar 2003 22:18:38 -0000	1.108.2.6
+++ pgp-menu-traditional/po/fr.po Apr 2003 10:31:06 -0000
@@ -561,8 +561,8 @@ msgstr "<d�faut>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(c)hiffrer, (s)igner, (e)n tant que, les (d)eux, ou (o)ublier ? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, (t)raditionnel en ligne, ou (o)ublier ? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "csedo"
+msgid "esabtf"
+msgstr "csedto"
 
@@ -3318,4 +3318,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 ?"
 
--- pgp-menu-traditional/po/gl.po Mar 2003 22:18:39 -0000	1.61.2.5
+++ pgp-menu-traditional/po/gl.po Apr 2003 10:31:06 -0000
@@ -538,8 +538,8 @@ msgstr "<por defecto>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "�(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas ou (o)lvidar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "�(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (t)raditional interior, ou (o)lvidar? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "efcao"
+msgid "esabtf"
+msgstr "efcato"
 
@@ -3216,4 +3216,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?"
 
--- pgp-menu-traditional/po/hu.po Mar 2003 22:18:39 -0000	1.17.2.5
+++ pgp-menu-traditional/po/hu.po Apr 2003 10:31:07 -0000
@@ -539,8 +539,8 @@ msgstr "<alapeset>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(t)itkos�t, (a)l��r, al��r (m)int, titkos�t �(s) al��r, m�(g)se? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "(t)itkos�t, (a)l��r, al��r (m)int, titkos�t �(s) al��r, traditional (b)e�gyazott, m�(g)se? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "tamsg"
+msgid "esabtf"
+msgstr "tamsbg"
 
@@ -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 ""
--- pgp-menu-traditional/po/id.po Mar 2003 22:18:39 -0000	1.84.2.6
+++ pgp-menu-traditional/po/id.po Apr 2003 10:31:07 -0000
@@ -537,8 +537,8 @@ msgstr "<default>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(a)cak, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (b)atal? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, traditional (i)nline, (b)atal? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "atsdb"
+msgid "esabtf"
+msgstr "atsdib"
 
@@ -3187,4 +3187,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?"
 
--- pgp-menu-traditional/po/it.po Mar 2003 22:18:39 -0000	1.103.2.5
+++ pgp-menu-traditional/po/it.po Apr 2003 10:31:07 -0000
@@ -540,8 +540,8 @@ msgstr "<predefinito>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "cifra(e), firma(s), firma come(a), entrambi(b), annulla(f) "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "cifra(e), firma(s), firma come(a), entrambi(b), (t)radizionale in linea , annulla(f) "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "esabf"
+msgid "esabtf"
+msgstr "esabtf"
 
@@ -3177,4 +3177,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?"
 
--- pgp-menu-traditional/po/ja.po Mar 2003 22:18:40 -0000	1.33.2.8
+++ pgp-menu-traditional/po/ja.po Apr 2003 10:31:08 -0000
@@ -533,8 +533,8 @@ msgstr "<������>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(e)�Ź沽,(s)��̾,(a)..�Ȥ��ƽ�̾,(b)ξ��,(f)̵����?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP (e)�Ź沽,(s)��̾,(a)..�Ȥ��ƽ�̾,(b)ξ��,(i)nline,(f)���?"
 
 #: compose.c:134
-msgid "esabf"
-msgstr ""
+msgid "esabtf"
+msgstr "esabif"
 
@@ -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��å�������������뤫?"
 
--- pgp-menu-traditional/po/ko.po Mar 2003 22:18:40 -0000	1.72.2.6
+++ pgp-menu-traditional/po/ko.po Apr 2003 10:31:08 -0000
@@ -535,8 +535,8 @@ msgstr "<�⺻��>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "��ȣȭ(e), ����(s), ��� ����(a), �� ��(b), ���(f)? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP ��ȣȭ(e), ����(s), ��� ����(a), �� ��(b), (i)nline, ���(f)? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "esabf"
+msgid "esabtf"
+msgstr "esabif"
 
@@ -3176,4 +3176,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 ������ ������?"
 
--- pgp-menu-traditional/po/lt.po Mar 2003 22:18:40 -0000	1.25.2.5
+++ pgp-menu-traditional/po/lt.po Apr 2003 10:31:08 -0000
@@ -537,5 +537,5 @@ msgstr "<�prastas>"
 #, fuzzy
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
 msgstr ""
-"(u)��ifruot, pa(s)ira�yt, pasira�yt k(a)ip, a(b)u, rinktis (m)ic algoritm�, "
+"(u)��ifruot, pa(s)ira�yt, pasira�yt k(a)ip, a(b)u, traditional (l)ai�ke, "
 "ar (p)amir�ti?"
@@ -544,4 +544,4 @@ msgstr ""
 #, fuzzy
-msgid "esabf"
-msgstr "usabmp"
+msgid "esabtf"
+msgstr "usablp"
 
@@ -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�?"
 
--- pgp-menu-traditional/po/nl.po Mar 2003 22:18:40 -0000	1.74.2.5
+++ pgp-menu-traditional/po/nl.po Apr 2003 10:31:09 -0000
@@ -538,5 +538,4 @@ msgstr "<standaard>"
 #, fuzzy
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr ""
-"(v)ersleutel, (o)ndert, ondert (a)ls, (b)eide, (m)ic selecteren, (g)een PGP"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eide, (t)raditioneel bericht, (g)een? "
 
@@ -544,4 +543,4 @@ msgstr ""
 #, fuzzy
-msgid "esabf"
-msgstr "voabmg"
+msgid "esabtf"
+msgstr "voabtg"
 
@@ -3176,4 +3175,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?"
 
--- pgp-menu-traditional/po/pl.po Mar 2003 22:18:41 -0000	1.94.2.8
+++ pgp-menu-traditional/po/pl.po Apr 2003 10:31:09 -0000
@@ -536,8 +536,8 @@ msgstr "<domy�lnie>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, b(e)z PGP? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, (t)raditional inline, b(e)z PGP? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "zsabe"
+msgid "esabtf"
+msgstr "zsabte"
 
@@ -3189,4 +3189,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?"
 
--- pgp-menu-traditional/po/pt_BR.po Mar 2003 22:18:41 -0000	1.58.2.6
+++ pgp-menu-traditional/po/pt_BR.po Apr 2003 10:31:09 -0000
@@ -540,5 +540,5 @@ msgstr "<padr�o>"
 #, fuzzy
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
 msgstr ""
-"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
+"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, (t)raditional em linha, ou es(q)uece? "
 
@@ -546,4 +546,4 @@ msgstr ""
 #, fuzzy
-msgid "esabf"
-msgstr "escamq"
+msgid "esabtf"
+msgstr "escatq"
 
@@ -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?"
 
--- pgp-menu-traditional/po/ru.po Mar 2003 22:18:41 -0000	1.129.2.9
+++ pgp-menu-traditional/po/ru.po Apr 2003 10:31:10 -0000
@@ -542,8 +542,8 @@ msgstr "<�� ���������>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(e)����, (s)�������, (a)������� ���, (b)���, (f)����������? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP (e)����, (s)�������, (a)������� ���, (b)���, traditional (i)nline, (f)����������? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr "esabf"
+msgid "esabtf"
+msgstr "esabif"
 
@@ -3204,4 +3204,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?"
 
--- pgp-menu-traditional/po/sk.po Mar 2003 22:18:42 -0000	1.66.2.5
+++ pgp-menu-traditional/po/sk.po Apr 2003 10:31:10 -0000
@@ -547,5 +547,5 @@ msgstr "<�td>"
 #, fuzzy
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
 msgstr ""
-"(e)-�ifr, (s)-podp, podp (a)ko, o(b)e, ozna� alg. mi(c), alebo (f)-zabudn�� "
+"(e)-�ifr, (s)-podp, podp (a)ko, o(b)e, (t)raditional inline, alebo (f)-zabudn�� "
 "na to? "
@@ -554,4 +554,4 @@ msgstr ""
 #, fuzzy
-msgid "esabf"
-msgstr "esabmf"
+msgid "esabtf"
+msgstr "esabtf"
 
@@ -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"
--- pgp-menu-traditional/po/sv.po Mar 2003 22:18:42 -0000	1.80.2.7
+++ pgp-menu-traditional/po/sv.po Apr 2003 10:31:10 -0000
@@ -530,8 +530,8 @@ msgstr "<standard>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(k)ryptera, (s)ignera, signera s(o)m, (b)�da, eller sk(i)ppa det?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)�da, (t)raditional infogat, eller sk(i)ppa det?"
 
 #: compose.c:134
-msgid "esabf"
-msgstr "ksobi"
+msgid "esabtf"
+msgstr "ksobti"
 
@@ -3186,4 +3186,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'?"
 
--- pgp-menu-traditional/po/tr.po Mar 2003 22:18:43 -0000	1.25.2.5
+++ pgp-menu-traditional/po/tr.po Apr 2003 10:31:10 -0000
@@ -535,5 +535,5 @@ msgstr "<varsay�lan>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
 msgstr ""
-"�(i)frele, i(m)zala, (f)arkl� imzala, i(k)isi de, mi(c) algoritmini se� "
+"�(i)frele, i(m)zala, (f)arkl� imzala, i(k)isi de, (t)raditional inline, "
 "yoksa i(p)talm�? "
@@ -541,4 +541,4 @@ msgstr ""
 #: compose.c:134
-msgid "esabf"
-msgstr "imfkcp"
+msgid "esabtf"
+msgstr "imfktp"
 
@@ -3197,4 +3197,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�?"
 
--- pgp-menu-traditional/po/uk.po Mar 2003 22:18:43 -0000	1.84.2.6
+++ pgp-menu-traditional/po/uk.po Apr 2003 10:31:11 -0000
@@ -530,8 +530,8 @@ msgstr "<�� ����������>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "����.(e), Ц��.(s), Ц��. ��(a), ���(b) �� צ�ͦ��(f)? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
+msgstr "����.(e), Ц��.(s), Ц��. ��(a), ���(b), traditional (i)nline �� צ�ͦ��(f)? "
 
 #: compose.c:134
-msgid "esabf"
-msgstr ""
+msgid "esabtf"
+msgstr "esabif"
 
@@ -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 ����?"
 
--- pgp-menu-traditional/po/zh_CN.po Mar 2003 22:18:43 -0000	1.14.2.5
+++ pgp-menu-traditional/po/zh_CN.po Apr 2003 10:31:11 -0000
@@ -544,5 +544,5 @@ msgstr "<Ԥ��ֵ>"
 #, fuzzy
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
 msgstr ""
-"(e)����, (s)ǩ��, (a)�ñ������ǩ, (b)���߽�Ҫ, ѡ�� (m)ic ���㷨 �� (f)��"
+"(e)����, (s)ǩ��, (a)�ñ������ǩ, (b)���߽�Ҫ, (t)raditional inline, �� (f)��"
 "����"
@@ -550,3 +550,3 @@ msgstr ""
 #: compose.c:134
-msgid "esabf"
+msgid "esabtf"
 msgstr ""
@@ -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 ���ż���"
 
--- pgp-menu-traditional/po/zh_TW.po Mar 2003 22:18:43 -0000	1.11.2.5
+++ pgp-menu-traditional/po/zh_TW.po Apr 2003 10:31:12 -0000
@@ -535,3 +535,3 @@ msgstr "<預設值>"
 #: compose.c:133
-msgid "(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)raditional inline, or (f)orget it? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
@@ -539,4 +539,4 @@ msgstr "(1)加密, (2)簽名, (3)用別�
 #: compose.c:134
-msgid "esabf"
-msgstr "12345"
+msgid "esabtf"
+msgstr "1234t5"
 
@@ -3200,4 +3200,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 的信件？"