diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 4e5f451ce2..d7c6a1f2b0 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -158,6 +158,7 @@
     </provider>
     <provider
         name="gmx.com"
+        domain="gmx\\.com,gmx\\.us"
         keepalive="9"
         link="https://support.gmx.com/pop-imap/imap/index.html#breadcrumb_help_pop-imap_imap_server">
         <imap
@@ -169,8 +170,27 @@
             port="587"
             starttls="true" />
     </provider>
-    <provider
-        name="gmx.net"
+    <!--select>
+        <optgroup label="FreeMail">
+            <option value="gmx.de">@gmx.de</option>
+            <option value="gmx.net">@gmx.net</option>
+            <option value="mein.gmx">@mein.gmx</option>
+            <option value="gmx.at">@gmx.at</option>
+            <option value="gmx.ch">@gmx.ch</option>
+        </optgroup>
+        <optgroup label="Premium">
+            <option value="mail.gmx">@mail.gmx</option>
+            <option value="email.gmx">@email.gmx</option>
+            <option value="gmx.eu">@gmx.eu</option>
+            <option value="gmx.org">@gmx.org</option>
+            <option value="gmx.info">@gmx.info</option>
+            <option value="gmx.biz">@gmx.biz</option>
+            <option value="gmx.com">@gmx.com</option>
+        </optgroup>
+    </select-->
+    <provider
+        name="gmx.de"
+        domain="gmx\\.de,gmx\\.net,mein\\.gmx,gmx\\.at,gmx\\.ch,mail\\.gmx,email\\.gmx,gmx\\.eu,gmx\\.org,gmx\\.info,gmx\\.biz"
         keepalive="9"
         link="https://hilfe.gmx.net/pop-imap/imap/imap-serverdaten.html#indexlink_help_pop-imap_imap">
         <imap