diff --git a/lib/widgets/renderers/event.dart b/lib/widgets/renderers/event.dart
index 46b68eb..8e7373a 100644
--- a/lib/widgets/renderers/event.dart
+++ b/lib/widgets/renderers/event.dart
@@ -197,16 +197,14 @@ class const EventRenderer(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8)
                           .copyWith(top: isGrouped ? 0 : 8),
-                      child: Row(
-                        mainAxisSize: .min,
+                      child: Wrap(
+                        verticalDirection: .up,
                         spacing: 6,
+                        crossAxisAlignment: .center,
                         children: [
-                          Flexible(child: child),
+                          child,
                           if (child is! MessageRenderer)
-                            Flexible(
-                              flex: 0,
-                              child: Timestamp(event.timestamp),
-                            ),
+                            Timestamp(event.timestamp),
                         ],
                       ),
                     ),
diff --git a/lib/widgets/renderers/message.dart b/lib/widgets/renderers/message.dart
index eff516c..99c3141 100644
--- a/lib/widgets/renderers/message.dart
+++ b/lib/widgets/renderers/message.dart
@@ -17,7 +17,6 @@ import "package:nexus/widgets/message_image.dart";
 import "package:nexus/widgets/reaction_row.dart";
 import "package:nexus/widgets/timestamp.dart";
 import "package:nexus/widgets/url_preview.dart";
-import "package:timeago/timeago.dart";
 import "package:nexus/widgets/event_preview.dart";
 import "package:nexus/widgets/players/video.dart";
 import "package:nexus/widgets/players/audio.dart";