diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index bb6b4ee119..ae19336393 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -554,9 +554,15 @@ public class EmailProvider implements Parcelable {
                 if (provider.enabled &&
                         provider.imap.host.equals(candidate.imap.host) ||
                         provider.smtp.host.equals(candidate.smtp.host)) {
-                    EntityLog.log(context, "Replacing auto config by profile=" + provider.name);
+                    EntityLog.log(context, "Replacing auto config host by profile=" + provider.name);
                     return Arrays.asList(provider);
-                }
+                } else if (provider.enabled && provider.mx != null)
+                    for (String mx : provider.mx)
+                        if ((candidate.imap.host != null && candidate.imap.host.matches(mx)) ||
+                                (candidate.smtp.host != null && candidate.smtp.host.matches(mx))) {
+                            EntityLog.log(context, "Replacing auto config MC by profile=" + provider.name);
+                            return Arrays.asList(provider);
+                        }
 
             // https://help.dreamhost.com/hc/en-us/articles/214918038-Email-client-configuration-overview
             if (candidate.imap.host != null &&
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 42cf83515b..b88203be2a 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -2064,4 +2064,17 @@
             port="465"
             starttls="false" />
     </provider>
+    <provider
+        name="Greensta.de"
+        link="https://support.greensta.de/help/de-de/4-e-mail/55-wie-kann-ich-mein-e-mail-programm-z-b-outlook-thunderbird-einrichten"
+        mx=".*\\.greensta\\.de">
+        <imap
+            host="mail.greensta.de"
+            port="993"
+            starttls="false" />
+        <smtp
+            host="mail.greensta.de"
+            port="465"
+            starttls="false" />
+    </provider>
 </providers>