diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 2e414adaa..2a2bdbe8b 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -45,7 +45,6 @@ import '../../widgets/matrix.dart';
 import 'package:fluffychat/utils/tor_stub.dart'
     if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
 
-
 enum PopupMenuAction {
   settings,
   invite,
diff --git a/lib/pangea/toolbar/widgets/message_token_text.dart b/lib/pangea/toolbar/widgets/message_token_text.dart
index 87ee21166..b4dcc1758 100644
--- a/lib/pangea/toolbar/widgets/message_token_text.dart
+++ b/lib/pangea/toolbar/widgets/message_token_text.dart
@@ -241,27 +241,19 @@ class MessageTextWidget extends StatelessWidget {
             // if the tokenPosition is a combination of the token and preceding / following punctuation
             // split them so that only the token itself is highlighted when clicked
             String start = '';
-            String middle = substring;
+            String middle = '';
             String end = '';
 
             final startSplitIndex =
-                (tokenPosition.tokenStart - tokenPosition.start);
-            final endSplitIndex = (tokenPosition.end - tokenPosition.tokenEnd);
+                tokenPosition.tokenStart - tokenPosition.start;
+            final endSplitIndex = tokenPosition.tokenEnd - tokenPosition.start;
 
-            if (tokenPosition.tokenStart != tokenPosition.start) {
-              start = substring.substring(0, startSplitIndex);
-            }
-
-            if (tokenPosition.end != tokenPosition.tokenEnd) {
-              end = substring.substring(endSplitIndex);
-            }
-
-            if (start.isNotEmpty || end.isNotEmpty) {
-              middle = substring.substring(
-                start.isEmpty ? 0 : start.length,
-                substring.length - (end.isEmpty ? 0 : end.length),
-              );
-            }
+            start = substring.substring(0, startSplitIndex);
+            end = substring.substring(endSplitIndex);
+            middle = substring.substring(
+              startSplitIndex,
+              endSplitIndex,
+            );
 
             return WidgetSpan(
               child: MouseRegion(