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 612050c6c84a09bcbeafaf4aca820c5853f51c36..baf39c9499ad31b7abb9c09d40acb542b7cf82f2 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -69,6 +69,8 @@ import com.google.common.collect.ImmutableList;
 
 import com.lelloman.identicon.view.GithubIdenticonView;
 
+import io.ipfs.cid.Cid;
+
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -80,10 +82,10 @@ import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.ipfs.cid.Cid;
-
 import me.saket.bettermovementmethod.BetterLinkMovementMethod;
 
+import net.fellbaum.jemoji.EmojiManager;
+
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -707,15 +709,12 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     }
                 }
             }
-            Matcher matcher = Emoticons.getEmojiPattern(body).matcher(body);
-            while (matcher.find()) {
-                if (matcher.start() < matcher.end()) {
+            for (final var emoji : EmojiManager.extractEmojisInOrderWithIndex(body.toString())) {
                     body.setSpan(
                             new RelativeSizeSpan(1.2f),
-                            matcher.start(),
-                            matcher.end(),
+                            emoji.getCharIndex(),
+                            emoji.getCharIndex() + emoji.getEmoji().getEmoji().length(),
                             Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                }
             }
 
             if (processMarkup) StylingHelper.format(body, viewHolder.messageBody.getCurrentTextColor());
diff --git a/src/main/java/eu/siacs/conversations/utils/Emoticons.java b/src/main/java/eu/siacs/conversations/utils/Emoticons.java
index 8ab891a68d57e5abe9c942dc576544054a8b95c3..7143dea34b4e51b768c53a8d362c71b108dbb7f4 100644
--- a/src/main/java/eu/siacs/conversations/utils/Emoticons.java
+++ b/src/main/java/eu/siacs/conversations/utils/Emoticons.java
@@ -1,70 +1,8 @@
-/*
- * Copyright (c) 2017, Daniel Gultsch All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 package eu.siacs.conversations.utils;
 
-import android.util.LruCache;
-
-import java.util.HashSet;
-import java.util.regex.Pattern;
-
 import net.fellbaum.jemoji.EmojiManager;
 
 public class Emoticons {
-
-    private static final int MAX_EMOIJS = 42;
-    private static final LruCache<CharSequence, Pattern> CACHE = new LruCache<>(256);
-
-    public static Pattern getEmojiPattern(final CharSequence input) {
-        Pattern pattern = CACHE.get(input);
-        if (pattern == null) {
-            pattern = generatePattern(input);
-            CACHE.put(input, pattern);
-        }
-        return pattern;
-    }
-
-    private static Pattern generatePattern(CharSequence input) {
-        final HashSet<String> emojis = new HashSet<>();
-        for (final var emoji : EmojiManager.extractEmojisInOrder(input.toString())) {
-            emojis.add(emoji.getUnicode());
-        }
-        final StringBuilder pattern = new StringBuilder();
-        for (String emoji : emojis) {
-            if (pattern.length() != 0) {
-                pattern.append('|');
-            }
-            pattern.append(Pattern.quote(emoji));
-        }
-        return Pattern.compile(pattern.toString());
-    }
-
     public static boolean isEmoji(String input) {
         return EmojiManager.isEmoji(input);
     }