diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 9396c69022..a6e40ae977 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -137,6 +137,7 @@ public class MessageHelper {
         //props.put("mail.imaps.compress.strategy", "0");
 
         props.put("mail.imaps.throwsearchexception", "true");
+        //props.put("mail.imaps.partialfetch", "false");
         props.put("mail.imaps.fetchsize", Integer.toString(FETCH_SIZE));
         props.put("mail.imaps.peek", "true");
 
@@ -161,6 +162,7 @@ public class MessageHelper {
         props.put("mail.imap.compress.enable", "true");
 
         props.put("mail.imap.throwsearchexception", "true");
+        //props.put("mail.imap.partialfetch", "false");
         props.put("mail.imap.fetchsize", Integer.toString(FETCH_SIZE));
         props.put("mail.imap.peek", "true");