Fixes FS#139: Do not merge messages at all

1 files changed, 1 insertions, 5 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
index b822ef0e..3a4c3d4b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
@@ -260,16 +260,12 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return null;
 	}
 
+    // TODO Check if this is really necessary
 	public void populateWithMessages(final List<Message> messages) {
 		synchronized (this.messages) {
 			messages.clear();
 			messages.addAll(this.messages);
 		}
-		for(Iterator<Message> iterator = messages.iterator(); iterator.hasNext();) {
-			if (iterator.next().wasMergedIntoPrevious()) {
-				iterator.remove();
-			}
-		}
 	}
 
 	@Override