diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
index 83d1431adbb6cd51ca946064ba2a940f7b31738e..80954646f2a32cbfeadc81eee056ef80b75302a4 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
@@ -144,13 +144,11 @@ public class AttachmentController {
 
         IntentAndResolvedActivitiesCount resolvedIntentInfo;
         String mimeType = attachment.mimeType;
-        if (MimeTypeUtil.isDefaultMimeType(mimeType)) {
-            resolvedIntentInfo = getViewIntentForMimeType(intentDataUri, inferredMimeType);
-        } else {
+        resolvedIntentInfo = getViewIntentForMimeType(intentDataUri, inferredMimeType);
+
+        if (!resolvedIntentInfo.hasResolvedActivities() && !MimeTypeUtil.isDefaultMimeType(mimeType) &&
+                !mimeType.equals(inferredMimeType)) {
             resolvedIntentInfo = getViewIntentForMimeType(intentDataUri, mimeType);
-            if (!resolvedIntentInfo.hasResolvedActivities() && !inferredMimeType.equals(mimeType)) {
-                resolvedIntentInfo = getViewIntentForMimeType(intentDataUri, inferredMimeType);
-            }
         }
 
         if (!resolvedIntentInfo.hasResolvedActivities()) {