diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 1489f6485..ef945d711 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -219,9 +219,14 @@ class HtmlMessage extends StatelessWidget {
);
if (substringIndex == -1) continue;
- final int tokenIndex = result[substringIndex].indexOf(tokenText);
+ int tokenIndex = result[substringIndex].indexOf(tokenText);
if (tokenIndex == -1) continue;
+ final beforeSubstring = result[substringIndex].substring(0, tokenIndex);
+ if (beforeSubstring.length != beforeSubstring.characters.length) {
+ tokenIndex = beforeSubstring.characters.length;
+ }
+
final int tokenLength = tokenText.characters.length;
final before =
result[substringIndex].characters.take(tokenIndex).toString();