From 171eb97e55467025f309a036d88a1dcb519f0bb1 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 26 Jun 2019 20:42:52 +0200
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e526dcaa58..bee2023ae7 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -637,7 +637,8 @@ public class MessageHelper {
     }
 
     long getReceived() throws MessagingException {
-        return imessage.getReceivedDate().getTime();
+        Date received = imessage.getReceivedDate();
+        return (received == null ? new Date() : received).getTime();
     }
 
     Long getSent() throws MessagingException {