1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 260678728..fe8031b2a 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -472,7 +472,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         if (this.messages.size() == 0) {
             Message message = new Message(this, "", Message.ENCRYPTION_NONE);
             message.setType(Message.TYPE_STATUS);
-            message.setTime(getCreated());
+            message.setTime(Math.max(getCreated(), getLastClearHistory()));
             return message;
         } else {
             Message message = this.messages.get(this.messages.size() - 1);