diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 4aa64e538a..d5cb0aacb7 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3287,6 +3287,9 @@ class Core {
             boolean use_modseq = prefs.getBoolean("use_modseq", true);
             boolean perform_expunge = prefs.getBoolean("perform_expunge", true);
 
+            if (account.isYahoo() || account.isAol())
+                sync_nodate = false;
+
             if (account.isZoho()) {
                 sync_unseen = false;
                 sync_flagged = false;
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 0d5d8ea656..26ac9250d3 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -184,6 +184,14 @@ public class EntityAccount extends EntityOrder implements Serializable {
         return (host != null && host.toLowerCase(Locale.ROOT).startsWith("imap.zoho."));
     }
 
+    boolean isYahoo() {
+        return "imap.mail.yahoo.com".equalsIgnoreCase(host);
+    }
+
+    boolean isAol() {
+        return "imap.aol.com".equalsIgnoreCase(host);
+    }
+
     boolean isTransient(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean enabled = prefs.getBoolean("enabled", true);