diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift b/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
index 3ca75d3ea..5b153425b 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
@@ -70,6 +70,7 @@ struct MessageComposer: View {
             Color.clear
                 .overlay(alignment: .top) {
                     composerView
+                        .clipped()
                         .readFrame($composerFrame)
                 }
                 .frame(minHeight: ComposerConstant.minHeight, maxHeight: max(composerHeight, composerFrame.height),
diff --git a/changelog.d/1832.bugfix b/changelog.d/1832.bugfix
new file mode 100644
index 000000000..4a48aa325
--- /dev/null
+++ b/changelog.d/1832.bugfix
@@ -0,0 +1 @@
+Long replies no longer overlay the replied message.
\ No newline at end of file