diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index acf1831c87..3e8bb0fa26 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -617,6 +617,7 @@ public abstract class DB extends RoomDatabase {
                                 dropTriggers(db);
 
                             createTriggers(db);
+                            dataUpdates(db);
 
                             ContentValues cv = new ContentValues();
                             cv.put("host", "imap.mnet-online.de");
@@ -740,6 +741,19 @@ public abstract class DB extends RoomDatabase {
                 " END");
     }
 
+    private static void dataUpdates(SupportSQLiteDatabase db) {
+        try {
+            db.execSQL("UPDATE identity" +
+                    " SET use_ip = 0" +
+                    " WHERE use_ip = 1 AND " +
+                    "(host = 'mail.optonline.net'" +
+                    " OR host = 'mail.optimum.net'" +
+                    " OR host = 'smtp.suddenlink.net')");
+        } catch (Throwable ex) {
+            Log.e(ex);
+        }
+    }
+
     private static void logMigration(int startVersion, int endVersion) {
         Map<String, String> crumb = new HashMap<>();
         crumb.put("startVersion", Integer.toString(startVersion));
@@ -3124,7 +3138,7 @@ public abstract class DB extends RoomDatabase {
                 });
     }
 
-    public static void defaultSearches(SupportSQLiteDatabase db, Context context) {
+    private static void defaultSearches(SupportSQLiteDatabase db, Context context) {
         try {
             BoundaryCallbackMessages.SearchCriteria criteria;
 
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 8e56f60f1e..f25277d3a5 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -2414,4 +2414,46 @@
             port="587"
             starttls="true" />
     </provider>
+    <provider
+        name="Optonline.net"
+        domain="optonline\\.net"
+        link="https://www.optimum.net/FAQ/#/answers/a_id/216"
+        useip="false">
+        <imap
+            host="mail.optonline.net"
+            port="993"
+            starttls="false" />
+        <smtp
+            host="mail.optonline.net"
+            port="465"
+            starttls="false" />
+    </provider>
+    <provider
+        name="Optimum.net"
+        domain="optimum\\.net"
+        link="https://www.optimum.net/FAQ/#/answers/a_id/216"
+        useip="false">
+        <imap
+            host="mail.optimum.net"
+            port="993"
+            starttls="false" />
+        <smtp
+            host="mail.optimum.net"
+            port="465"
+            starttls="false" />
+    </provider>
+    <provider
+        name="Suddenlink.net"
+        domain="suddenlink\\.net"
+        link="https://www.optimum.net/FAQ/#/answers/a_id/216"
+        useip="false">
+        <imap
+            host="imap.suddenlink.net"
+            port="993"
+            starttls="false" />
+        <smtp
+            host="smtp.suddenlink.net"
+            port="465"
+            starttls="false" />
+    </provider>
 </providers>