diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 80c7415177..7c5c206d65 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -290,15 +290,24 @@ public class EmailProvider implements Parcelable {
 
                 for (DnsHelper.DnsRecord record : records)
                     if (!TextUtils.isEmpty(record.name))
-                        for (EmailProvider provider : providers)
+                        for (EmailProvider provider : providers) {
                             if (provider.mx != null)
                                 for (String mx : provider.mx)
                                     if (record.name.toLowerCase(Locale.ROOT).matches(mx)) {
-                                        EntityLog.log(context, "Provider from mx=" + mx + " domain=" + domain);
+                                        EntityLog.log(context, "Provider from mx=" + record.name + " domain=" + domain);
                                         provider.log(context);
                                         return provider;
                                     }
 
+                            String mxparent = UriHelper.getParentDomain(context, record.name);
+                            String pdomain = UriHelper.getParentDomain(context, provider.imap.host);
+                            if (mxparent.equalsIgnoreCase(pdomain)) {
+                                EntityLog.log(context, "Provider from mx=" + record.name + " host=" + provider.imap.host);
+                                provider.log(context);
+                                return provider;
+                            }
+                        }
+
                 for (DnsHelper.DnsRecord record : records) {
                     String target = record.name;
                     while (autoconfig == null && target != null && target.indexOf('.') > 0) {
diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index 60bb0caff4..45764ba112 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -55,7 +55,7 @@ public class UriHelper {
                 if ((suffixList.contains(h) || suffixList.contains(w)) &&
                         !suffixList.contains('!' + h)) {
                     String parent = prefix + "." + h;
-                    Log.i("Host=" + host + " parent=" + parent);
+                    Log.d("Host=" + host + " parent=" + parent);
                     return parent;
                 }
             }
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index c315a125d2..d9f2b9d7c5 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -1147,8 +1147,7 @@
     </provider>
     <provider
         name="GoDaddy Workspace"
-        link="https://www.godaddy.com/help/server-and-port-settings-for-workspace-email-6949"
-        mx=".*\\.secureserver\\.net">
+        link="https://www.godaddy.com/help/server-and-port-settings-for-workspace-email-6949">
         <imap
             host="imap.secureserver.net"
             port="993"
@@ -1224,8 +1223,7 @@
     </provider>
     <provider
         name="Mail.com"
-        link="https://support.mail.com/premium/imap/server.html#indexlink_help_premium_imap"
-        mx=".*\\.mail\\.com">
+        link="https://support.mail.com/premium/imap/server.html#indexlink_help_premium_imap">
         <imap
             host="imap.mail.com"
             port="993"
@@ -1237,8 +1235,7 @@
     </provider>
     <provider
         name="Namecheap"
-        link="https://www.namecheap.com/support/knowledgebase/article.aspx/1179/2175/general-private-email-configuration-for-mail-clients-and-mobile-devices/"
-        mx=".*\\.privateemail\\.com">
+        link="https://www.namecheap.com/support/knowledgebase/article.aspx/1179/2175/general-private-email-configuration-for-mail-clients-and-mobile-devices/">
         <imap
             host="mail.privateemail.com"
             port="993"