diff --git a/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart b/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart
index 65c6d8d8..f7ddc1e1 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart
@@ -19,37 +19,37 @@ class MessageInputController extends ValueNotifier<Message> {
   /// message.
   factory MessageInputController({
     Message? message,
-    Map<RegExp, TextStyleBuilder>? textPatternStyle,
+    Map<RegExp, InlineSpanBuilder>? textPatternSpan,
   }) =>
       MessageInputController._(
         initialMessage: message ?? Message(),
-        textPatternStyle: textPatternStyle,
+        textPatternSpan: textPatternSpan,
       );
 
   /// Creates a controller for an editable text field from an initial [text].
   factory MessageInputController.fromText(
     String? text, {
-    Map<RegExp, TextStyleBuilder>? textPatternStyle,
+    Map<RegExp, InlineSpanBuilder>? textPatternSpan,
   }) =>
       MessageInputController._(
         initialMessage: Message(text: text),
-        textPatternStyle: textPatternStyle,
+        textPatternSpan: textPatternSpan,
       );
 
   /// Creates a controller for an editable text field from initial
   /// [attachments].
   factory MessageInputController.fromAttachments(
     List<Attachment> attachments, {
-    Map<RegExp, TextStyleBuilder>? textPatternStyle,
+    Map<RegExp, InlineSpanBuilder>? textPatternSpan,
   }) =>
       MessageInputController._(
         initialMessage: Message(attachments: attachments),
-        textPatternStyle: textPatternStyle,
+        textPatternSpan: textPatternSpan,
       );
 
   MessageInputController._({
     required Message initialMessage,
-    Map<RegExp, TextStyleBuilder>? textPatternStyle,
+    Map<RegExp, InlineSpanBuilder>? textPatternSpan,
   })  : _textEditingController = MessageTextFieldController.fromValue(
           initialMessage.text == null
               ? const TextEditingValue()
@@ -57,7 +57,7 @@ class MessageInputController extends ValueNotifier<Message> {
                   text: initialMessage.text!,
                   composing: TextRange.collapsed(initialMessage.text!.length),
                 ),
-          textPatternStyle: textPatternStyle,
+          textPatternSpan: textPatternSpan,
         ),
         _initialMessage = initialMessage,
         super(initialMessage) {
diff --git a/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart b/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart
index 0f9f75c6..cba47cf2 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-/// A function that takes a [BuildContext] and returns a [TextStyle].
-typedef TextStyleBuilder = TextStyle? Function(
+/// A function that takes a [BuildContext] and returns an [InlineSpan].
+typedef InlineSpanBuilder = InlineSpan Function(
   BuildContext context,
   String text,
 );
@@ -11,17 +11,17 @@ class MessageTextFieldController extends TextEditingController {
   /// Returns a new MessageTextFieldController
   MessageTextFieldController({
     String? text,
-    this.textPatternStyle,
+    this.textPatternSpan,
   }) : super(text: text);
 
   /// Returns a new MessageTextFieldController with the given text [value].
   MessageTextFieldController.fromValue(
     TextEditingValue? value, {
-    this.textPatternStyle,
+    this.textPatternSpan,
   }) : super.fromValue(value);
 
   /// A map of style to apply to the text matching the RegExp patterns.
-  final Map<RegExp, TextStyleBuilder>? textPatternStyle;
+  final Map<RegExp, InlineSpanBuilder>? textPatternSpan;
 
   /// Builds a [TextSpan] from the current text,
   /// highlighting the matches for [textPatternStyle].
@@ -31,7 +31,7 @@ class MessageTextFieldController extends TextEditingController {
     TextStyle? style,
     required bool withComposing,
   }) {
-    final pattern = textPatternStyle;
+    final pattern = textPatternSpan;
     if (pattern == null || pattern.isEmpty) {
       return super.buildTextSpan(
         context: context,
@@ -45,13 +45,10 @@ class MessageTextFieldController extends TextEditingController {
       onMatch: (match) {
         final text = match[0]!;
         final key = pattern.keys.firstWhere((it) => it.hasMatch(text));
-        return TextSpan(
-          text: text,
-          style: pattern[key]?.call(
-            context,
-            text,
-          ),
-        );
+        return pattern[key]?.call(context, text) ??
+            TextSpan(
+              text: text,
+            );
       },
     );
   }
@@ -60,10 +57,10 @@ class MessageTextFieldController extends TextEditingController {
 extension _TextSpanX on TextSpan {
   TextSpan splitMapJoin(
     Pattern pattern, {
-    TextSpan Function(Match)? onMatch,
-    TextSpan Function(TextSpan)? onNonMatch,
+    InlineSpan Function(Match)? onMatch,
+    InlineSpan Function(InlineSpan)? onNonMatch,
   }) {
-    final children = <TextSpan>[];
+    final children = <InlineSpan>[];
 
     toPlainText().splitMapJoin(
       pattern,