diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index d9485cd561..19d26ac858 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -4583,7 +4583,7 @@ class Core {
 
             Long received;
             long future = new Date().getTime() + FUTURE_RECEIVED;
-            if (account.use_date) {
+            if (account.use_date || EntityFolder.SENT.equals(folder.type)) {
                 received = sent;
                 if (received == null || received == 0 || received > future)
                     received = helper.getReceived();