diff --git a/imports/Spectral/Component/Emoji/EmojiPicker.qml b/imports/Spectral/Component/Emoji/EmojiPicker.qml
index c8651bb..526ccb0 100644
--- a/imports/Spectral/Component/Emoji/EmojiPicker.qml
+++ b/imports/Spectral/Component/Emoji/EmojiPicker.qml
@@ -69,6 +69,8 @@ ColumnLayout {
     Rectangle {
         Layout.fillWidth: true
         Layout.preferredHeight: 1
+        Layout.leftMargin: 12
+        Layout.rightMargin: 12
 
         color: MSettings.darkTheme ? "#424242" : "#e7ebeb"
     }
diff --git a/imports/Spectral/Panel/RoomPanelInput.qml b/imports/Spectral/Panel/RoomPanelInput.qml
index 314898a..cf01ba6 100644
--- a/imports/Spectral/Panel/RoomPanelInput.qml
+++ b/imports/Spectral/Panel/RoomPanelInput.qml
@@ -114,6 +114,8 @@ Control {
             Layout.fillWidth: true
             Layout.margins: 8
 
+            id: replyItem
+
             visible: isReply
 
             spacing: 8
@@ -145,13 +147,17 @@ Control {
 
             textArea: inputField
             emojiModel: EmojiModel { id: emojiModel }
+        }
 
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
+        Rectangle {
+            Layout.fillWidth: true
+            Layout.preferredHeight: 1
+            Layout.leftMargin: 12
+            Layout.rightMargin: 12
 
-                color: MSettings.darkTheme ? "#424242" : "#e7ebeb"
-            }
+            visible: emojiPicker.visible || replyItem.visible
+
+            color: MSettings.darkTheme ? "#424242" : "#e7ebeb"
         }
 
         RowLayout {
diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp
index f6c8839..09ec260 100644
--- a/src/roomlistmodel.cpp
+++ b/src/roomlistmodel.cpp
@@ -77,6 +77,7 @@ void RoomListModel::connectRoomSignals(SpectralRoom* room) {
   connect(room, &Room::aboutToAddNewMessages, this,
           [=](QMatrixClient::RoomEventsRange eventsRange) {
             RoomEvent* event = (eventsRange.end() - 1)->get();
+            if (event->isStateEvent()) return;
             User* sender = room->user(event->senderId());
             if (sender == room->localUser()) return;
             QUrl _url = room->avatarUrl();