Ian Bell (turnpike) reports that Outlook Express expects the

boundary parameter to be the _last_ MIME parameter on a multipart/*
body part, and otherwise displays messages as empty.

diff --git a/muttlib.c b/muttlib.c
index 1dcdff5b8884c40dac8e7d09f6bb6ac506c79b72..c73d0e06e03a8f28f8a2d01ef14e7d5452a1d7d1 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -282,7 +282,7 @@ char *mutt_get_parameter (const char *s, PARAMETER *p)
 void mutt_set_parameter (const char *attribute, const char *value, PARAMETER **p)
 {
   PARAMETER *q;
-  for(q = *p; q; q =  q->next)
+  for(q = *p; q; q = q->next)
   {
     if (mutt_strcasecmp (attribute, q->attribute) == 0)
     {

diff --git a/pgp.c b/pgp.c
index e499d515bf72ef20ae41342c4b56c85232d18f3f..5cc0c1d95b90ab7b35890059b5762bc90c3ce9d2 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -1097,9 +1097,9 @@ static BODY *pgp_sign_message (BODY *a)
   t->use_disp = 0;
   t->encoding = ENC7BIT;
 
+  mutt_generate_boundary (&t->parameter);
   mutt_set_parameter ("protocol", "application/pgp-signature", &t->parameter);
   mutt_set_parameter ("micalg", PgpSignMicalg, &t->parameter);
-  mutt_generate_boundary (&t->parameter);
 
   t->parts = a;
   a = t;
@@ -1310,8 +1310,8 @@ static BODY *pgp_encrypt_message (BODY *a, char *keylist, int sign)
   t->encoding = ENC7BIT;
   t->use_disp = 0;
 
-  mutt_set_parameter("protocol", "application/pgp-encrypted", &t->parameter);
   mutt_generate_boundary(&t->parameter);
+  mutt_set_parameter("protocol", "application/pgp-encrypted", &t->parameter);
   
   t->parts = mutt_new_body ();
   t->parts->type = TYPEAPPLICATION;