diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index bd0462401..ea14cc600 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -113,8 +113,6 @@ class ChatController extends State<ChatPageWithRoom>
   // #Pangea
   final PangeaController pangeaController = MatrixState.pangeaController;
 
-  // final GlobalKey<ChatFooterState> chatFooterKey = GlobalKey<ChatFooterState>();
-
   late Choreographer choreographer = Choreographer(pangeaController, this);
   // Pangea#
   Room get room => sendingClient.getRoomById(roomId) ?? widget.room;
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 783ccbb6a..0b03441d1 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -301,8 +301,11 @@ class ChatView extends StatelessWidget {
                     child: Column(
                       children: <Widget>[
                         Expanded(
-                          child: Stack(
+                          child:
+                              // #Pangea
+                              Stack(
                             children: [
+                              // Pangea#
                               GestureDetector(
                                 onTap: controller.clearSingleSelectedEvent,
                                 child: Builder(
@@ -321,6 +324,7 @@ class ChatView extends StatelessWidget {
                                   },
                                 ),
                               ),
+                              // #Pangea
                               Positioned(
                                 left: 0,
                                 right: 0,
@@ -346,12 +350,12 @@ class ChatView extends StatelessWidget {
                                     ITBar(
                                       choreographer: controller.choreographer,
                                     ),
-                                    // if (!controller.selectMode)
                                     ReplyDisplay(controller),
                                   ],
                                 ),
                               ),
                             ],
+                            // Pangea#
                           ),
                         ),
                         if (controller.room.canSendDefaultMessages &&
@@ -436,22 +440,19 @@ class ChatView extends StatelessWidget {
                                         ),
                                       ],
                                     )
-                                  // #Pangea
-                                  // : Column(
-                                  // mainAxisSize: MainAxisSize.min,
-                                  // children: [
-                                  //   const ConnectionStatusHeader(),
-                                  //   ITBar(
-                                  //     choreographer:
-                                  //         controller.choreographer,
-                                  //   ),
-                                  //   ReactionsPicker(controller),
-                                  //   ReplyDisplay(controller),
-                                  //   ChatInputRow(controller),
-                                  //   ChatEmojiPicker(controller),
-                                  // ],
                                   : Column(
+                                      mainAxisSize: MainAxisSize.min,
                                       children: [
+                                        // #Pangea
+                                        //   const ConnectionStatusHeader(),
+                                        //   ITBar(
+                                        //     choreographer:
+                                        //         controller.choreographer,
+                                        //   ),
+                                        //   ReactionsPicker(controller),
+                                        //   ReplyDisplay(controller),
+                                        //   ChatInputRow(controller),
+                                        //   ChatEmojiPicker(controller),
                                         ReactionsPicker(controller),
                                         ChatInputRow(controller),
                                       ],