diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
index ee6753e8b..01ae471f8 100644
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@@ -286,6 +286,8 @@ class MessageContent extends StatelessWidget {
             final bigEmotes = event.onlyEmotes &&
                 event.numberEmotes > 0 &&
                 event.numberEmotes <= 10;
+            // #Pangea
+            // return Linkify(
             final messageTextStyle = TextStyle(
               color: textColor,
               fontSize: bigEmotes ? fontSize * 3 : fontSize,
@@ -301,11 +303,10 @@ class MessageContent extends StatelessWidget {
               );
             } else if (pangeaMessageEvent != null) {
               toolbarController?.toolbar?.textSelection.setMessageText(
-                pangeaMessageEvent!.body,
+                (event.getDisplayEvent(pangeaMessageEvent!.timeline).body),
               );
             }
 
-            // return Linkify(
             return SelectableLinkify(
               onSelectionChanged: (selection, cause) {
                 if (cause == SelectionChangedCause.longPress &&
diff --git a/lib/pangea/widgets/chat/overlay_message.dart b/lib/pangea/widgets/chat/overlay_message.dart
index bc25ffe14..d7c99f07b 100644
--- a/lib/pangea/widgets/chat/overlay_message.dart
+++ b/lib/pangea/widgets/chat/overlay_message.dart
@@ -15,14 +15,12 @@ class OverlayMessage extends StatelessWidget {
   final Event? previousEvent;
   final bool selected;
   final Timeline timeline;
-  // #Pangea
   // final LanguageModel? selectedDisplayLang;
   final bool immersionMode;
   // final bool definitions;
   final bool ownMessage;
   final ToolbarDisplayController toolbarController;
   final double? width;
-  // Pangea#
 
   const OverlayMessage(
     this.event, {
@@ -30,12 +28,10 @@ class OverlayMessage extends StatelessWidget {
     this.previousEvent,
     this.selected = false,
     required this.timeline,
-    // #Pangea
     required this.immersionMode,
     required this.ownMessage,
     required this.toolbarController,
     this.width,
-    // Pangea#
     super.key,
   });
 
@@ -46,14 +42,12 @@ class OverlayMessage extends StatelessWidget {
       return const SizedBox.shrink();
     }
 
-    var color = Theme.of(context).colorScheme.surfaceVariant;
-    // #Pangea
+    var color = Theme.of(context).colorScheme.surfaceContainerHighest;
     final isLight = Theme.of(context).brightness == Brightness.light;
     var lightness = isLight ? .05 : .85;
-    // Pangea#
     final textColor = ownMessage
         ? Theme.of(context).colorScheme.onPrimary
-        : Theme.of(context).colorScheme.onBackground;
+        : Theme.of(context).colorScheme.onSurface;
 
     const hardCorner = Radius.circular(4);
 
@@ -118,13 +112,11 @@ class OverlayMessage extends StatelessWidget {
           : (color.blue * lightness).round(),
     );
 
-    // #Pangea
     final pangeaMessageEvent = PangeaMessageEvent(
       event: event,
       timeline: timeline,
       ownMessage: ownMessage,
     );
-    // Pangea#
 
     return Material(
       color: noBubble ? Colors.transparent : color,
@@ -152,7 +144,7 @@ class OverlayMessage extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             MessageContent(
-              event,
+              event.getDisplayEvent(timeline),
               textColor: textColor,
               borderRadius: borderRadius,
               selected: selected,
@@ -162,13 +154,10 @@ class OverlayMessage extends StatelessWidget {
               isOverlay: true,
             ),
             if (event.hasAggregatedEvents(
-                      timeline,
-                      RelationshipTypes.edit,
-                    ) // #Pangea
-                    ||
-                    (pangeaMessageEvent.showUseType)
-                // Pangea#
-                )
+                  timeline,
+                  RelationshipTypes.edit,
+                ) ||
+                (pangeaMessageEvent.showUseType))
               Padding(
                 padding: const EdgeInsets.only(
                   top: 4.0,
@@ -176,7 +165,6 @@ class OverlayMessage extends StatelessWidget {
                 child: Row(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    // #Pangea
                     if (pangeaMessageEvent.showUseType) ...[
                       pangeaMessageEvent.useType.iconView(
                         context,
@@ -188,14 +176,13 @@ class OverlayMessage extends StatelessWidget {
                       timeline,
                       RelationshipTypes.edit,
                     )) ...[
-                      // Pangea#
                       Icon(
                         Icons.edit_outlined,
                         color: textColor.withAlpha(164),
                         size: 14,
                       ),
                       Text(
-                        ' - ${event.originServerTs.localizedTimeShort(context)}',
+                        ' - ${event.getDisplayEvent(timeline).originServerTs.localizedTimeShort(context)}',
                         style: TextStyle(
                           color: textColor.withAlpha(164),
                           fontSize: 12,
diff --git a/lib/pangea/widgets/igc/pangea_rich_text.dart b/lib/pangea/widgets/igc/pangea_rich_text.dart
index 262f37824..5f8dc615e 100644
--- a/lib/pangea/widgets/igc/pangea_rich_text.dart
+++ b/lib/pangea/widgets/igc/pangea_rich_text.dart
@@ -70,12 +70,11 @@ class PangeaRichTextState extends State<PangeaRichText> {
 
   void setTextSpan() {
     if (_fetchingRepresentation == true) {
-      _setTextSpan(textSpan = widget.pangeaMessageEvent.body);
-      return;
-    }
-
-    if (repEvent != null) {
-      _setTextSpan(repEvent!.text);
+      _setTextSpan(
+        textSpan = widget.pangeaMessageEvent.event
+            .getDisplayEvent(widget.pangeaMessageEvent.timeline)
+            .body,
+      );
       return;
     }