Fix more RFC2047 encoding bugs. Once again from Gero Treuner

<gero@faveve.uni-stuttgart.de>.

diff --git a/parse.c b/parse.c
index 6fae766705f951acd9649646542c45a4d5a4cdfe..ccace28b4f63b93984c47e785254db4b2c6e2c3a 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -1207,6 +1207,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs,
       }
       else
        last = e->userhdrs = mutt_new_list ();
+      rfc2047_decode (line, line, linelen);
       last->data = safe_strdup (line);
     }
 

diff --git a/sendlib.c b/sendlib.c
index 4516792f25d93d742ed8ce774d975317e710b230..e089e1f5fbf3a9eb5a3091941f893d8c2c0a2387 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1834,6 +1834,11 @@ void mutt_prepare_envelope (ENVELOPE *env, int final)
 
 void mutt_unprepare_envelope (ENVELOPE *env)
 {
+  LIST *item;
+
+  for (item = env->userhdrs; item; item = item->next)
+    rfc2047_decode (item->data, item->data,  mutt_strlen (item->data) + 1);
+
   rfc822_free_address (&env->mail_followup_to);
 
   /* back conversions */