diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index ad31e5da0e..3dd2829dd7 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -89,7 +89,7 @@ public class MailService implements AutoCloseable {
             Log.i("Using SOCKS proxy=" + host + ":" + port);
         }
 
-        properties.put("mail.event.scope", "session");
+        properties.put("mail.event.scope", "folder");
         properties.put("mail.event.executor", executor);
 
         properties.put("mail." + protocol + ".sasl.realm", realm == null ? "" : realm);