From dc9a87e606a5feb568e366ab85441c9d14bbb17b Mon Sep 17 00:00:00 2001
From: Alain Bench <veronatif@free.fr>
Date: Mon, 29 Dec 2003 11:44:35 +0000
Subject: [PATCH] Fix #844.

---
 commands.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/commands.c b/commands.c
index 3761926d..f2381d2a 100644
--- a/commands.c
+++ b/commands.c
@@ -641,16 +641,17 @@ static void set_copy_flags (HEADER *hdr, int decode, int decrypt, int *cmflags,
   {
     *chflags = CH_XMIT | CH_MIME | CH_TXTPLAIN;
     *cmflags = M_CM_DECODE | M_CM_CHARCONV;
-  }
 
-  /* respect $weed only if decode doesn't kick in
-   * for decrypt.
-   */
+    if (!decrypt)	/* If decode doesn't kick in for decrypt, */
+    {
+      *chflags |= CH_DECODE;	/* then decode RFC 2047 headers, */
 
-  if (decode && !decrypt && option (OPTWEED))
-  {
-    *chflags |= CH_WEED;
-    *cmflags |= M_CM_WEED;
+      if (option (OPTWEED))
+      {
+	*chflags |= CH_WEED;	/* and respect $weed. */
+	*cmflags |= M_CM_WEED;
+      }
+    }
   }
 }
 
-- 
2.40.0