diff --git a/src/app/mainview/components/ChatViewFooter.qml b/src/app/mainview/components/ChatViewFooter.qml
index 3f14f7aea87c563500f4cc0799324f3947e7f0e7..e6b31331849a72072b452ce4d5368a8ea1b1a9b0 100644
--- a/src/app/mainview/components/ChatViewFooter.qml
+++ b/src/app/mainview/components/ChatViewFooter.qml
@@ -116,7 +116,8 @@ Rectangle {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: footerColumnLayout.width
             Layout.maximumWidth: JamiTheme.chatViewMaximumWidth
-            Layout.preferredHeight: 36
+            Layout.minimumHeight: 36
+            Layout.preferredHeight: 36 * JamiTheme.baseZoom
             visible: MessagesAdapter.replyToId !== ""
         }
 
@@ -126,7 +127,8 @@ Rectangle {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: footerColumnLayout.width
             Layout.maximumWidth: JamiTheme.chatViewMaximumWidth
-            Layout.preferredHeight: 36
+            Layout.minimumHeight: 36
+            Layout.preferredHeight: 36 * JamiTheme.baseZoom
             visible: MessagesAdapter.editId !== ""
         }
 
diff --git a/src/app/mainview/components/EditContainer.qml b/src/app/mainview/components/EditContainer.qml
index e4576fc3c4048395efe3b332df1319aea1cc810b..0404a30762f8e98ec41261ed1fb1c38daa76e5cf 100644
--- a/src/app/mainview/components/EditContainer.qml
+++ b/src/app/mainview/components/EditContainer.qml
@@ -65,7 +65,7 @@ Rectangle {
                     id: metrics
                     elide: Text.ElideRight
                     elideWidth: root.width - 100
-                    text: root.body
+                    text: UtilsAdapter.getOneline(root.body)
                 }
 
                 text: metrics.elidedText
diff --git a/src/app/utilsadapter.cpp b/src/app/utilsadapter.cpp
index cb1fdd83c791aa668658f7ce708df4cf22498475..c6d9654db599352aa438fb252780e69514e56a7d 100644
--- a/src/app/utilsadapter.cpp
+++ b/src/app/utilsadapter.cpp
@@ -735,3 +735,13 @@ UtilsAdapter::hasNativeDarkTheme() const
 #endif
 #endif
 }
+
+QString
+UtilsAdapter::getOneline(const QString& input)
+{
+    auto output = input;
+    auto index = output.indexOf("\n");
+    if (index > 0)
+        output.truncate(index);
+    return output;
+}
diff --git a/src/app/utilsadapter.h b/src/app/utilsadapter.h
index c0a520e5cdaca0b03da0a2f45def82d29f5ffc5c..eef34dca05f412c43416f0bde523f422900203d5 100644
--- a/src/app/utilsadapter.h
+++ b/src/app/utilsadapter.h
@@ -139,6 +139,8 @@ public:
     Q_INVOKABLE bool useApplicationTheme();
     Q_INVOKABLE bool hasNativeDarkTheme() const;
 
+    Q_INVOKABLE QString getOneline(const QString& input);
+
 Q_SIGNALS:
     void debugMessageReceived(const QString& message);
     void changeFontSize();