diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 1a04ef237c..bc09665a51 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -140,6 +140,10 @@ public class EntityAccount extends EntityOrder implements Serializable {
     public String error;
     public Long last_connected;
 
+    boolean isGmail() {
+        return "imap.gmail.com".equalsIgnoreCase(host);
+    }
+
     String getProtocol() {
         switch (protocol) {
             case TYPE_IMAP:
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 18b620f174..e3e1f87794 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -189,7 +189,7 @@ public class EntityOperation {
                     }
 
                 EntityAccount account = db.account().getAccount(message.account);
-                if (!"imap.gmail.com".equalsIgnoreCase(account == null ? null : account.host) ||
+                if ((account != null && !account.isGmail()) ||
                         !EntityFolder.ARCHIVE.equals(source.type) ||
                         EntityFolder.TRASH.equals(target.type) || EntityFolder.JUNK.equals(target.type))
                     db.message().setMessageUiHide(message.id, true);