Fix #844.

diff --git a/commands.c b/commands.c
index 3761926d4042a76d65b06110403e8824f63c0ae3..f2381d2a53b4d5d0862f7c0356021b4cd42d0401 100644 (file)
--- 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;
+      }
+    }
   }
 }