diff --git a/src/com/fsck/k9/mail/internet/MimeBodyPart.java b/src/com/fsck/k9/mail/internet/MimeBodyPart.java
index dfb39e366..31be6e267 100644
--- a/src/com/fsck/k9/mail/internet/MimeBodyPart.java
+++ b/src/com/fsck/k9/mail/internet/MimeBodyPart.java
@@ -91,7 +91,7 @@ public class MimeBodyPart extends BodyPart
             //using org.apache.commons.codec.net.QuotedPrintableCodec
             //when it will implement all rules (missing #3, $4 & #5) of the RFC
             //http://www.ietf.org/rfc/rfc1521.txt
-            setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
+           // setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
         }
     }
 
diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/src/com/fsck/k9/mail/internet/MimeMessage.java
index e4c1009a0..ac172821e 100644
--- a/src/com/fsck/k9/mail/internet/MimeMessage.java
+++ b/src/com/fsck/k9/mail/internet/MimeMessage.java
@@ -379,7 +379,8 @@ public class MimeMessage extends Message
         {
             setHeader(MimeHeader.HEADER_CONTENT_TYPE, String.format("%s;\n charset=utf-8",
                       getMimeType()));
-            setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
+            // TODO: Should this be quoted-printable?
+           // setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
         }
     }
 
diff --git a/src/com/fsck/k9/mail/internet/TextBody.java b/src/com/fsck/k9/mail/internet/TextBody.java
index a2e2e673f..7a32d9cc8 100644
--- a/src/com/fsck/k9/mail/internet/TextBody.java
+++ b/src/com/fsck/k9/mail/internet/TextBody.java
@@ -21,7 +21,10 @@ public class TextBody implements Body
         if (mBody!=null)
         {
             byte[] bytes = mBody.getBytes("UTF-8");
-            out.write(Base64.encodeBase64Chunked(bytes));
+            out.write(bytes);
+
+            // TODO: Should this be quoted-printable?
+            //out.write(Base64.encodeBase64Chunked(bytes));
         }
     }