diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index e7e098815eaf1c1541c634fb11f945770588f2e4..2e27db2bcaa5a4493d531e0e4500595cfc323d53 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -691,6 +691,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 Message message = new Message(this, "", Message.ENCRYPTION_NONE);
                 message.setType(Message.TYPE_STATUS);
                 message.setTime(Math.max(getCreated(), getLastClearHistory().getTimestamp()));
+                message.setTimeReceived(Math.max(getCreated(), getLastClearHistory().getTimestamp()));
                 return message;
             } else {
                 return this.messages.get(this.messages.size() - 1);
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 47fde1f5051683508e46a1bc2394df2730acf528..8234408b31c58116fd82c6bd1159f89d441245ae 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -528,6 +528,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         this.timeSent = time;
     }
 
+    public void setTimeReceived(long time) {
+        this.timeReceived = time;
+    }
+
     public String getEncryptedBody() {
         return this.encryptedBody;
     }