diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java
index 0fd320c0a..1ab056482 100644
--- a/src/com/fsck/k9/mail/internet/MimeUtility.java
+++ b/src/com/fsck/k9/mail/internet/MimeUtility.java
@@ -883,7 +883,8 @@ public class MimeUtility {
      * Table format: wrong type, correct type
      */
     private static final String[][] MIME_TYPE_REPLACEMENT_MAP = new String[][] {
-        {"image/jpg", "image/jpeg"}
+        {"image/jpg", "image/jpeg"},
+        {"image/pjpeg", "image/jpeg"}   // see issue 1712
     };
 
     public static String unfold(String s) {