diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 74f0651672..0a77115167 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -235,14 +235,14 @@ public class EmailService implements AutoCloseable {
         Log.i("Timeout=" + timeout);
         if (purpose == PURPOSE_SEARCH) {
             properties.put("mail." + protocol + ".connectiontimeout", Integer.toString(timeout));
-            //properties.put("mail." + protocol + ".writetimeout", Integer.toString(SEARCH_TIMEOUT));
+            properties.put("mail." + protocol + ".writetimeout", Integer.toString(SEARCH_TIMEOUT));
             properties.put("mail." + protocol + ".timeout", Integer.toString(SEARCH_TIMEOUT));
         } else {
             int factor = 2;
             if ("smtp".equals(protocol) || "smtps".equals(protocol))
                 factor *= 2;
             properties.put("mail." + protocol + ".connectiontimeout", Integer.toString(timeout));
-            //properties.put("mail." + protocol + ".writetimeout", Integer.toString(timeout * factor));
+            properties.put("mail." + protocol + ".writetimeout", Integer.toString(timeout * factor));
             properties.put("mail." + protocol + ".timeout", Integer.toString(timeout * factor));
         }