diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b1d50f2b7f..8dfb12566d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3507,10 +3507,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             String type = attachment.getMimeType();
                             String title = (attachment.name == null ? file.getName() : attachment.name);
 
-                            // Fix mime type
-                            if ("image/jpg".equals(type))
-                                type = "image/jpeg";
-
                             ContentValues values = new ContentValues();
                             values.put(MediaStore.Images.Media.RELATIVE_PATH, "Pictures/" + folder);
                             values.put(MediaStore.Images.Media.TITLE, title);
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 8bd6a6bb06..65d8d28a33 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -242,7 +242,7 @@ public class EntityAttachment {
             return "audio/midi";
 
         // https://www.rfc-editor.org/rfc/rfc3555.txt
-        if ("video/jpeg".equals(type))
+        if ("image/jpg".equals(type) || "video/jpeg".equals(type))
             return "image/jpeg";
 
         if (!TextUtils.isEmpty(type) &&