diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index 3c85288..3694b3d 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -8,6 +8,7 @@ import 'package:fluffychat/utils/string_color.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
+import '../adaptive_page_layout.dart';
 import '../avatar.dart';
 import '../matrix.dart';
 import '../message_reactions.dart';
@@ -86,6 +87,8 @@ class Message extends StatelessWidget {
               color: color,
               borderRadius: BorderRadius.circular(radius),
             ),
+            constraints:
+                BoxConstraints(maxWidth: AdaptivePageLayout.defaultMinWidth),
             child: Stack(
               children: <Widget>[
                 Column(
diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index b3a3d8f..ee4e2ee 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -672,26 +672,16 @@ class _ChatState extends State<_Chat> {
                                       child: Swipeable(
                                         key: ValueKey(
                                             filteredEvents[i - 1].eventId),
-                                        background: Container(
-                                          color: Theme.of(context)
-                                              .primaryColor
-                                              .withAlpha(100),
+                                        background: Padding(
                                           padding: EdgeInsets.symmetric(
                                               horizontal: 12.0),
-                                          alignment: Alignment.centerLeft,
-                                          child: Row(
-                                            children: [
-                                              Icon(Icons.reply),
-                                              SizedBox(width: 2.0),
-                                              Text(L10n.of(context).reply)
-                                            ],
+                                          child: Center(
+                                            child: Icon(Icons.reply),
                                           ),
                                         ),
-                                        direction: SwipeDirection.startToEnd,
-                                        onSwipe: (direction) {
-                                          replyAction(
-                                              replyTo: filteredEvents[i - 1]);
-                                        },
+                                        direction: SwipeDirection.endToStart,
+                                        onSwipe: (direction) => replyAction(
+                                            replyTo: filteredEvents[i - 1]),
                                         child: Message(filteredEvents[i - 1],
                                             onAvatarTab: (Event event) {
                                               sendController.text +=