diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 6d88c8d65e..f640058691 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2263,7 +2263,7 @@ class Core {
                 : ifolder.search(new MessageIDTerm(message.msgid));
 
         // Fallback
-        if (false)
+        if (account.isOutlook())
             if (imessages == null || imessages.length == 0)
                 try {
                     // Needed for Outlook