diff --git a/Source/CTMIME_HtmlPart.m b/Source/CTMIME_HtmlPart.m
index ba2a28b..08eabc9 100644
--- a/Source/CTMIME_HtmlPart.m
+++ b/Source/CTMIME_HtmlPart.m
@@ -92,8 +92,7 @@
     int r;
 
     /* text/html part */
-    //TODO this needs to be changed, something other than 8BIT should be used
-    mime_fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
+    mime_fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_QUOTED_PRINTABLE);
     content = mailmime_content_new_with_str("text/html");
     param = mailmime_parameter_new(strdup("charset"), strdup(DEST_CHARSET));
     r = clist_append(content->ct_parameters, param);
diff --git a/Source/CTMIME_TextPart.m b/Source/CTMIME_TextPart.m
index 20c094a..3cbfeae 100644
--- a/Source/CTMIME_TextPart.m
+++ b/Source/CTMIME_TextPart.m
@@ -91,8 +91,7 @@
     int r;
 
     /* text/plain part */
-    //TODO this needs to be changed, something other than 8BIT should be used
-    mime_fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
+    mime_fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_QUOTED_PRINTABLE);
     content = mailmime_content_new_with_str("text/plain");
     param = mailmime_parameter_new(strdup("charset"), strdup(DEST_CHARSET));
     r = clist_append(content->ct_parameters, param);