Change summary
src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Detailed changes
@@ -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);