diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java
index f0528b632..05d0d0bfd 100644
--- a/src/com/fsck/k9/mail/internet/MimeUtility.java
+++ b/src/com/fsck/k9/mail/internet/MimeUtility.java
@@ -15,7 +15,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
@@ -368,7 +367,7 @@ public class MimeUtility
                      */
                     final String originalCharset = getHeaderParameter(part.getContentType(), "charset");
                     String charset = "ASCII";   // No encoding, so use us-ascii, which is the standard.
-                    if (originalCharset != null)
+                    if ((originalCharset != null) && ("0".equals(originalCharset) == false))
                     {
                         /*
                          * See if there is conversion from the MIME charset to the Java one.