diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 773f3cb532..58a9440902 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -508,7 +508,7 @@ public class FragmentSetup extends FragmentEx {
 
     private Intent getIntentHelp() {
         Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/SETUP.md"));
+        intent.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/SETUP.md#setup-help"));
         return intent;
     }
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 9f205e5bb2..90c784b47d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -64,6 +64,7 @@ public class MessageHelper {
     private String raw = null;
 
     final static int NETWORK_TIMEOUT = 60 * 1000; // milliseconds
+    final static int CLOSE_TIMEOUT = 20 * 1000; // milliseconds
 
     static Properties getSessionProperties(int auth_type, boolean insecure) {
         Properties props = new Properties();
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index db8ca5de3e..3cacc2f74d 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1172,9 +1172,11 @@ public class ServiceSynchronize extends LifecycleService {
                         });
                         t.start();
                         try {
-                            t.join(MessageHelper.NETWORK_TIMEOUT);
-                            if (t.isAlive())
+                            t.join(MessageHelper.CLOSE_TIMEOUT);
+                            if (t.isAlive()) {
                                 Log.w(Helper.TAG, account.name + " Close timeout");
+                                t.interrupt();
+                            }
                         } catch (InterruptedException ex) {
                             Log.w(Helper.TAG, account.name + " close wait " + ex.toString());
                             t.interrupt();