diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index aba5c600415ad5d075b84fe670d3a92a566d0aae..f882b7e1dc84604ce2f12e32deca485de917d3e2 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -669,7 +669,7 @@ public class Message extends AbstractEntity {
 	}
 
 	public boolean bodyIsOnlyEmojis() {
-		return EmojiManager.isOnlyEmojis(body.trim());
+		return EmojiManager.isOnlyEmojis(body.replaceAll("\\s",""));
 	}
 
 	public FileParams getFileParams() {
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index a954b11cccd749f1aa567e01680dc9ee04f4f7d3..2dc8bbbcda44f259e87e66760ce75598fa3ce13c 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -793,7 +793,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 			if (GeoHelper.isGeoUri(message.getBody())) {
 				displayLocationMessage(viewHolder,message);
 			} else if (message.bodyIsOnlyEmojis()) {
-				displayEmojiMessage(viewHolder, message.getBody().trim());
+				displayEmojiMessage(viewHolder, message.getBody().replaceAll("\\s",""));
 			} else if (message.treatAsDownloadable()) {
 				try {
 					URL url = new URL(message.getBody());