diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
index be324278d3..ee0a0bde12 100644
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@@ -221,9 +221,6 @@ class MessageContent extends StatelessWidget with PlayVideoActionMixin {
               return RedactedContent(event: event);
             }
 
-            final bigEmotes = event.onlyEmotes &&
-                event.numberEmotes > 0 &&
-                event.numberEmotes <= 10;
             return FutureBuilder<String>(
               future: event.calcLocalizedBody(
                 MatrixLocals(L10n.of(context)!),
@@ -248,11 +245,10 @@ class MessageContent extends StatelessWidget with PlayVideoActionMixin {
                           Theme.of(context).textTheme.bodyLarge?.copyWith(
                                 color: Theme.of(context).colorScheme.onSurface,
                               ),
-                      linkStyle: TextStyle(
-                        color: Theme.of(context).colorScheme.secondary,
-                        fontSize: bigEmotes ? fontSize * 3 : fontSize,
-                        decorationColor: textColor.withAlpha(150),
-                      ),
+                      linkStyle:
+                          Theme.of(context).textTheme.bodyLarge?.copyWith(
+                                color: Theme.of(context).colorScheme.secondary,
+                              ),
                       childWidget: Visibility(
                         visible: false,
                         maintainSize: true,
diff --git a/pubspec.lock b/pubspec.lock
index 060e6c41aa..25f679998e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1575,8 +1575,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "feat/add-text-span-builder"
-      resolved-ref: f159e4de7db4a70fa1830cf7c4a066979aa1464d
+      ref: twake-supported
+      resolved-ref: "326f4ef15303bbbd13971912fd84e936b60e521d"
       url: "https://github.com/linagora/matrix_link_text.git"
     source: git
     version: "2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 743b328d62..e41e198980 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -66,7 +66,7 @@ dependencies:
   keyboard_shortcuts: ^0.1.4
   latlong2: ^0.8.1
   matrix:
-    git: 
+    git:
       url: git@github.com:linagora/matrix-dart-sdk.git
       ref: twake-supported-0.22.4
   matrix_homeserver_recommendations: ^0.3.0
@@ -269,12 +269,13 @@ dependency_overrides:
       url: https://github.com/chandrabezzo/wakelock.git
       ref: main
       path: wakelock_windows/
-  # TODO: Remove it after this PR merged
+  # TODO: Remove this part after upstream contribution is merged
   # https://github.com/Sorunome/matrix_link_text/pull/4
+  # https://github.com/Sorunome/matrix_link_text/pull/5
   matrix_link_text:
-    git: 
+    git:
       url: https://github.com/linagora/matrix_link_text.git
-      ref: feat/add-text-span-builder
+      ref: twake-supported
 
 cider:
   link_template: