From 4a3a9ffdc17e04d60371fead9ffe32d72a3565a8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 25 Aug 2021 21:38:55 +0200
Subject: [PATCH] Configure raw socket options

---
 app/src/main/java/eu/faircode/email/EmailService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index e0ddaa3ce7..e0a32089f0 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -911,6 +911,7 @@ public class EmailService implements AutoCloseable {
 
         @Override
         public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+            configureSocketOptions(s);
             return configure(factory.createSocket(s, server, port, autoClose));
         }
 
@@ -932,8 +933,6 @@ public class EmailService implements AutoCloseable {
         }
 
         private Socket configure(Socket socket) throws SocketException {
-            configureSocketOptions(socket);
-
             if (socket instanceof SSLSocket) {
                 SSLSocket sslSocket = (SSLSocket) socket;