From 00b2e30938a2a185e4c786fc683b60cf47774019 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 7 Feb 2015 12:29:17 +0100
Subject: trim message bodys on display

---
 src/main/java/eu/siacs/conversations/entities/Message.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities')

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 8112f5de..ce421ceb 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -376,9 +376,9 @@ public class Message extends AbstractEntity {
 	public String getMergedBody() {
 		final Message next = this.next();
 		if (this.mergeable(next)) {
-			return getBody() + '\n' + next.getMergedBody();
+			return getBody().trim() + '\n' + next.getMergedBody();
 		}
-		return getBody();
+		return getBody().trim();
 	}
 
 	public boolean hasMeCommand() {
-- 
cgit v1.2.3