diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java
index f22834235..33ec8f7f5 100644
--- a/src/com/fsck/k9/mail/internet/MimeUtility.java
+++ b/src/com/fsck/k9/mail/internet/MimeUtility.java
@@ -888,7 +888,8 @@ public class MimeUtility {
      */
     private static final String[][] MIME_TYPE_REPLACEMENT_MAP = new String[][] {
         {"image/jpg", "image/jpeg"},
-        {"image/pjpeg", "image/jpeg"}   // see issue 1712
+        {"image/pjpeg", "image/jpeg"},   // see issue 1712
+        {"application/x-zip-compressed", "application/zip"} // see issue 3791
     };
 
     public static String unfold(String s) {