1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index d13e90743..885e84f1d 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -4,6 +4,8 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.text.SpannableStringBuilder;
 
+import com.vdurmont.emoji.EmojiManager;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -501,8 +503,8 @@ public class Message extends AbstractEntity {
                         !this.treatAsDownloadable() &&
                         !message.getBody().startsWith(ME_COMMAND) &&
                         !this.getBody().startsWith(ME_COMMAND) &&
-                        !this.bodyIsHeart() &&
-                        !message.bodyIsHeart() &&
+                        !this.bodyIsOnlyEmojis() &&
+                        !message.bodyIsOnlyEmojis() &&
                         !this.bodyIsXmpp() &&
                         !message.bodyIsXmpp() &&
                         ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) &&
@@ -669,8 +671,8 @@ public class Message extends AbstractEntity {
         }
     }
 
-    public boolean bodyIsHeart() {
-        return body != null && UIHelper.HEARTS.contains(body.trim());
+    public boolean bodyIsOnlyEmojis() {
+        return EmojiManager.isOnlyEmojis(body.trim());
     }
 
     public boolean bodyIsXmpp() {