X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1e0b1d40a6285c532b722f4584fa7ddde220deff..d3ecbe4bae7a3f1972b553d4b1efab3079ef0bae:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 2e177c47..26d8524d 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -17,7 +17,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -361,15 +360,17 @@ finish_field:
     }
     m_getfld_state_destroy (&gstate);
 
-    /*
-     * Iterate through the list of headers and call the function to MIME-ify
-     * them if required.
-     */
+    if (header_encoding != CE_8BIT) {
+        /*
+         * Iterate through the list of headers and call the function to MIME-ify
+         * them if required.
+         */
 
-    for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) {
-	if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) {
-	    adios(NULL, "Unable to encode header \"%s\"", hp->name);
-	}
+        for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) {
+            if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) {
+                adios(NULL, "Unable to encode header \"%s\"", hp->name);
+            }
+        }
     }
 
     /*
@@ -1749,8 +1750,11 @@ build_headers (CT ct, int header_encoding)
     if (ct->c_descr) {
 	np = add (DESCR_FIELD, NULL);
 	vp = concat (" ", ct->c_descr, NULL);
-	if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL))
-	    adios(NULL, "Unable to encode %s header", DESCR_FIELD);
+	if (header_encoding != CE_8BIT) {
+	    if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL)) {
+		adios(NULL, "Unable to encode %s header", DESCR_FIELD);
+	    }
+	}
 	add_header (ct, np, vp);
     }