diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2015-02-07 12:29:17 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-02-07 12:29:17 +0100 |
| commit | 00b2e30938a2a185e4c786fc683b60cf47774019 (patch) | |
| tree | 2c49c74cc7c74875e9610f2072eeb92aee8c8783 /src/main/java/eu/siacs/conversations/entities | |
| parent | e1e09d5cba9374935d8c872ead21131f5dd61625 (diff) | |
trim message bodys on display
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 8112f5de2..ce421ceb6 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() { |