Changeset 3547:6367ba3dd8bf for commands.c

Timestamp:

2003-12-29 03:44:35 (5 years ago)

Author:

Alain Bench <veronatif@…>

Branch:

HEAD

Message:

Fix #844.

Files:

• commands.c (modified) (1 diff)

commands.c

@@ -642 +642 @@
     *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 (decode && !decrypt && option (OPTWEED))
-  {
-    *chflags |= CH_WEED;
-    *cmflags |= M_CM_WEED;
+
+    if (!decrypt)       /* If decode doesn't kick in for decrypt, */
+    {
+      *chflags |= CH_DECODE;    /* then decode RFC 2047 headers, */
+
+      if (option (OPTWEED))
+      {
+        *chflags |= CH_WEED;    /* and respect $weed. */
+        *cmflags |= M_CM_WEED;
+      }
+    }
   }
 }