diff --git a/app/src/main/java/eu/faircode/email/ActivityError.java b/app/src/main/java/eu/faircode/email/ActivityError.java
index 5662865be7..a3d81c2b90 100644
--- a/app/src/main/java/eu/faircode/email/ActivityError.java
+++ b/app/src/main/java/eu/faircode/email/ActivityError.java
@@ -95,6 +95,7 @@ public class ActivityError extends ActivityBase {
         long identity = intent.getLongExtra("identity", -1L);
         int protocol = intent.getIntExtra("protocol", -1);
         int auth_type = intent.getIntExtra("auth_type", -1);
+        String host = intent.getStringExtra("host");
         int faq = intent.getIntExtra("faq", -1);
 
         boolean isCertificateException = (message != null && message.contains("CertificateException"));
@@ -200,6 +201,11 @@ public class ActivityError extends ActivityBase {
                         .append(ServiceAuthenticator.getAuthTypeName(auth_type))
                         .append("\n");
 
+                if (!TextUtils.isEmpty(host))
+                    sb.append("host=")
+                            .append(host)
+                            .append("\n");
+
                 if (account > 0)
                     sb.append("protocol=")
                             .append(protocol == EntityAccount.TYPE_IMAP ? "imap" : "pop3")
diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 5d6754a06c..fa5a8dbb13 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -456,6 +456,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                     intent.putExtra("account", account.id);
                     intent.putExtra("protocol", account.protocol);
                     intent.putExtra("auth_type", account.auth_type);
+                    intent.putExtra("host", account.host);
                     intent.putExtra("personal", "personal");
                     intent.putExtra("address", "address");
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -916,6 +917,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                     intent.putExtra("account", account.id);
                     intent.putExtra("protocol", account.protocol);
                     intent.putExtra("auth_type", account.auth_type);
+                    intent.putExtra("host", account.host);
                     intent.putExtra("personal", "personal");
                     intent.putExtra("address", "address");
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 727b34bbe2..2bb02753b9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5221,6 +5221,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 intent.putExtra("account", message.account);
                 intent.putExtra("protocol", message.accountProtocol);
                 intent.putExtra("auth_type", ServiceAuthenticator.AUTH_TYPE_GRAPH);
+                intent.putExtra("host", "");
                 intent.putExtra("identity", message.identity);
                 intent.putExtra("personal", message.identityName);
                 intent.putExtra("address", message.identityEmail);
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 19d26ac858..766ae81333 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -5550,6 +5550,7 @@ class Core {
         intent.putExtra("account", account.id);
         intent.putExtra("protocol", account.protocol);
         intent.putExtra("auth_type", account.auth_type);
+        intent.putExtra("host", account.host);
         intent.putExtra("address", account.user);
         intent.putExtra("faq", 22);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 08ed4a3ff4..42a5d814a8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -384,6 +384,7 @@ public class FragmentFolders extends FragmentBase {
                         intent.putExtra("account", account.id);
                         intent.putExtra("protocol", account.protocol);
                         intent.putExtra("auth_type", account.auth_type);
+                        intent.putExtra("host", account.host);
                         intent.putExtra("address", account.user);
                         intent.putExtra("faq", 22);
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 5c8f169f4d..23cef82774 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -540,6 +540,7 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                                             intent.putExtra("account", identity.account);
                                             intent.putExtra("protocol", protocol);
                                             intent.putExtra("auth_type", AUTH_TYPE_GRAPH);
+                                            intent.putExtra("host", identity.host);
                                             intent.putExtra("identity", identity.id);
                                             intent.putExtra("personal", identity.name);
                                             intent.putExtra("address", identity.user);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 44d5371a1c..f8a20c9ddf 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1585,6 +1585,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
         intent.putExtra("account", account.id);
         intent.putExtra("protocol", account.protocol);
         intent.putExtra("auth_type", account.auth_type);
+        intent.putExtra("host", account.host);
         intent.putExtra("address", account.user);
         intent.putExtra("faq", 23);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);