diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 2642fcca7b..92d2908e9b 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -639,6 +639,8 @@ public class MessageHelper {
 
     long getReceived() throws MessagingException {
         Date received = imessage.getReceivedDate();
+        if (received == null)
+            received = imessage.getSentDate();
         return (received == null ? new Date() : received).getTime();
     }