Merge pull request #933 from betheg/mergeable

fix mergable() for /me command.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 32227ff8..ffb9390f 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -150,8 +150,9 @@ public class UIHelper {
 				return new Pair<>(getFileDescriptionString(context,message),true);
 			}
 		} else {
-			if (message.getBody().startsWith("/me ")) {
-				return new Pair<>(message.getBody().replaceAll("^/me ",UIHelper.getMessageDisplayName(message) + " "),false);
+			if (message.getBody().startsWith(Message.ME_COMMAND)) {
+				return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND,
+						UIHelper.getMessageDisplayName(message) + " "), false);
 			} else {
 				return new Pair<>(message.getBody(), false);
 			}