Merge branch 'master' into 'privacy_screen'

# Conflicts:
#   resources/qml/TimelineView.qml

2 files changed, 4 insertions, 6 deletions

diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml

index cb7d383f..4c73f28b 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -273,12 +273,6 @@ Rectangle {
                     cursorShape: Qt.IBeamCursor
                     onClicked: TimelineManager.timeline.input.paste(true)
                 }
-
-                NhekoDropArea {
-                    anchors.fill: parent
-                    roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : ""
-                }
-
             }
 
             ScrollBar.vertical: ScrollBar {
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml

index 14d55b23..527e6cb1 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -278,6 +278,10 @@ Page {
             MessageInput {
             }
 
+            NhekoDropArea {
+                anchors.fill: parent
+                roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : ""
+            }
         }
 
         PrivacyScreen {