From 254edc48f5aa841d0cc1587237c7dd05aaf774d7 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 7 Mar 2017 11:46:12 +0100
Subject: [PATCH] show conversation time as last clear date when empty

---
 src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index f8b354915..2626b202b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -456,7 +456,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);