diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 038855d097..26afe61120 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -963,11 +963,19 @@ public class EmailService implements AutoCloseable {
             if (ex.getMessage() != null &&
                     ex.getMessage().contains("LIST processing failed")) {
                 Log.w(ex);
-                folders.add(new EntityFolder("Inbox", EntityFolder.INBOX));
             } else
                 throw ex;
         }
 
+        boolean inbox = false;
+        for (EntityFolder folder : folders)
+            if (EntityFolder.INBOX.equals(folder.type)) {
+                inbox = true;
+                break;
+            }
+        if (!inbox)
+            folders.add(new EntityFolder("Inbox", EntityFolder.INBOX));
+
         return folders;
     }