diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 7b07f2b983278b68f274c762794ffc70b6a2b62e..c46399b59c604d3bb406e1b99b01ea437bfd7da8 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1001,7 +1001,12 @@ public class ConversationFragment extends XmppFragment
                 if (message.bodyIsOnlyEmojis()) {
                     SpannableStringBuilder spannable = message.getSpannableBody(null, null);
                     ImageSpan[] imageSpans = spannable.getSpans(0, spannable.length(), ImageSpan.class);
-                    if (imageSpans.length == 1) {
+                    for (ImageSpan span : imageSpans) {
+                        final int start = spannable.getSpanStart(span);
+                        final int end = spannable.getSpanEnd(span);
+                        spannable.delete(start, end);
+                    }
+                    if (imageSpans.length == 1 && spannable.toString().replaceAll("\\s", "").length() < 1) {
                         // Only one inline image, so it's a sticker
                         String source = imageSpans[0].getSource();
                         if (source != null && source.length() > 0 && source.substring(0, 4).equals("cid:")) {