diff --git a/src/app/mainview/components/ChatViewFooter.qml b/src/app/mainview/components/ChatViewFooter.qml
index 8668e9c85858a4adbb1d2a2668d4fbb886690551..549822cf92e37cc13f1125a1a25226b17ae0c129 100644
--- a/src/app/mainview/components/ChatViewFooter.qml
+++ b/src/app/mainview/components/ChatViewFooter.qml
@@ -79,6 +79,8 @@ Rectangle {
                 var editedMessageBody = MessagesAdapter.dataForInteraction(MessagesAdapter.editId, MessageList.Body);
                 messageBar.textAreaObj.insertText(editedMessageBody);
                 messageBar.textAreaObj.forceActiveFocus();
+            } else {
+                messageBar.textAreaObj.clearText();
             }
         }
 
@@ -115,7 +117,6 @@ Rectangle {
 
         EditContainer {
             id: editContainer
-
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: footerColumnLayout.width
             Layout.maximumWidth: JamiTheme.chatViewMaximumWidth
diff --git a/src/app/mainview/components/MessageBar.qml b/src/app/mainview/components/MessageBar.qml
index e619a195a7e1decdaa4d73bd50db84c8b6586b87..1f272fc5528879b4439da94f33a3815d444078e0 100644
--- a/src/app/mainview/components/MessageBar.qml
+++ b/src/app/mainview/components/MessageBar.qml
@@ -190,8 +190,12 @@ RowLayout {
                 onSendMessagesRequired: {
                     sendMessageButtonClicked();
                 }
-                onTextChanged: MessagesAdapter.userIsComposing(text ? true : false)
-
+                onTextChanged: {
+                    MessagesAdapter.userIsComposing(text ? true : false);
+                    if (!text) {
+                        messageBarTextArea.heightBinding();
+                    }
+                }
                 property var markdownShortCut: {
                     "Bold": function () {
                         if (!showPreview) {
diff --git a/src/app/mainview/components/MessageBarTextArea.qml b/src/app/mainview/components/MessageBarTextArea.qml
index 3e439910e18551f6cf6069bea14b836e040d0186..3e9a786b944d1c0f21ad9a36e36160d8aeeae516 100644
--- a/src/app/mainview/components/MessageBarTextArea.qml
+++ b/src/app/mainview/components/MessageBarTextArea.qml
@@ -48,7 +48,7 @@ JamiFlickable {
     signal sendMessagesRequired
 
     function heightBinding() {
-        textArea.height = Qt.binding(() => textArea.paintedHeight);
+        textArea.height = Qt.binding(() => textArea.lineCount === 1 ? 35 : textArea.paintedHeight);
     }
 
     function selectText(start, end) {
@@ -60,7 +60,11 @@ JamiFlickable {
     }
 
     function clearText() {
+        var multiLine = textArea.lineCount !== 1;
         textArea.clear();
+        if (multiLine) {
+            heightBinding();
+        }
     }
 
     function pasteText() {