diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 071f952eb..ff66eca46 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -249,6 +249,7 @@ class ChatView extends StatelessWidget {
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: [
+                      PinnedEvents(controller),
                       if (activeThreadId != null)
                         SizedBox(
                           height: ChatAppBarListTile.fixedHeight,
@@ -258,10 +259,16 @@ class ChatView extends StatelessWidget {
                                   controller.scrollToEventId(activeThreadId),
                               icon: const Icon(Icons.message),
                               label: Text(L10n.of(context).replyInThread),
+                              style: TextButton.styleFrom(
+                                foregroundColor:
+                                    theme.colorScheme.onSecondaryContainer,
+                                shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(4),
+                                ),
+                              ),
                             ),
                           ),
                         ),
-                      PinnedEvents(controller),
                       if (scrollUpBannerEventId != null)
                         ChatAppBarListTile(
                           leading: IconButton(
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 2e55683ee..c6a0da213 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -878,15 +878,24 @@ class Message extends StatelessWidget {
                   child: threadChildren.isEmpty
                       ? const SizedBox.shrink()
                       : Padding(
-                          padding: const EdgeInsets.only(top: 1.0, bottom: 4.0),
+                          padding: const EdgeInsets.only(
+                            top: 4.0,
+                            bottom: 8.0,
+                            left: Avatar.defaultSize + 8,
+                          ),
                           child: ConstrainedBox(
                             constraints: const BoxConstraints(
-                              maxWidth: 400,
+                              maxWidth: FluffyThemes.columnWidth * 1.5,
                             ),
                             child: TextButton.icon(
                               style: TextButton.styleFrom(
+                                shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(4),
+                                ),
+                                foregroundColor:
+                                    theme.colorScheme.onSecondaryContainer,
                                 backgroundColor:
-                                    theme.colorScheme.surfaceContainerHighest,
+                                    theme.colorScheme.secondaryContainer,
                               ),
                               onPressed: () => enterThread(event.eventId),
                               icon: const Icon(Icons.message),