diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 2621efedb3..e9ebfaa463 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -4845,6 +4845,7 @@ class Core {
 
                     if (body != null ||
                             (message.size != null && message.size < maxSize) ||
+                            account.isWpPl() ||
                             (MessageClassifier.isEnabled(context)) && folder.auto_classify_source)
                         try {
                             if (body == null)
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 05c3001590..bc517494ff 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -209,6 +209,10 @@ public class EntityAccount extends EntityOrder implements Serializable {
         return "imap.aol.com".equalsIgnoreCase(host);
     }
 
+    boolean isWpPl() {
+        return "imap.wp.pl".equalsIgnoreCase(host);
+    }
+
     boolean isICloud() {
         return "imap.mail.me.com".equalsIgnoreCase(host);
     }