diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index e23e4e7b5b..03e9276b62 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -131,7 +131,7 @@ public class EmailService implements AutoCloseable {
     private final static int SEARCH_TIMEOUT = 90 * 1000; // milliseconds
     private final static int FETCH_SIZE = 1024 * 1024; // bytes, default 16K
     private final static int POOL_SIZE = 2; // connections
-    private final static int POOL_TIMEOUT = 60 * 1000; // milliseconds, default 45 sec
+    private final static int POOL_TIMEOUT = 90 * 1000; // milliseconds, default 45 sec
 
     private final static int TCP_KEEP_ALIVE_INTERVAL = 9 * 60; // seconds
 
@@ -231,7 +231,7 @@ public class EmailService implements AutoCloseable {
             properties.put("mail.imap.starttls.enable", Boolean.toString(starttls));
             properties.put("mail.imap.starttls.required", Boolean.toString(starttls && !insecure));
 
-            properties.put("mail." + protocol + ".separatestoreconnection", "true");
+            properties.put("mail." + protocol + ".separatestoreconnection", "false");
             properties.put("mail." + protocol + ".connectionpool.debug", "true");
             properties.put("mail." + protocol + ".connectionpoolsize", Integer.toString(POOL_SIZE));
             properties.put("mail." + protocol + ".connectionpooltimeout", Integer.toString(POOL_TIMEOUT));