diff --git a/linphone-app/ui/modules/Linphone/Chat/Chat.qml b/linphone-app/ui/modules/Linphone/Chat/Chat.qml
index 78ed6008f..6637251d6 100644
--- a/linphone-app/ui/modules/Linphone/Chat/Chat.qml
+++ b/linphone-app/ui/modules/Linphone/Chat/Chat.qml
@@ -380,6 +380,7 @@ Rectangle {
 			Layout.fillWidth: true
 			Layout.preferredHeight: textAreaBorders.height + chatMessagePreview.height+messageBlock.height
 			color: ChatStyle.sendArea.backgroundBorder.color
+			visible: proxyModel.chatRoomModel && !proxyModel.chatRoomModel.isReadOnly && (!proxyModel.chatRoomModel.haveEncryption && SettingsModel.standardChatEnabled || proxyModel.chatRoomModel.haveEncryption && SettingsModel.secureChatEnabled)
 			ColumnLayout{
 				anchors.fill: parent				
 				spacing: 0
@@ -412,7 +413,6 @@ Rectangle {
 					Layout.leftMargin: ChatStyle.sendArea.backgroundBorder.width
 					borderColor: ChatStyle.sendArea.border.color
 					topWidth: ChatStyle.sendArea.border.width
-					visible: proxyModel.chatRoomModel && !proxyModel.chatRoomModel.isReadOnly && (!proxyModel.chatRoomModel.haveEncryption && SettingsModel.standardChatEnabled || proxyModel.chatRoomModel.haveEncryption && SettingsModel.secureChatEnabled)
 					
 					DroppableTextArea {
 						id: textArea
@@ -424,7 +424,7 @@ Rectangle {
 						anchors.right: parent.right
 						anchors.bottom: parent.bottom
 						
-						height:ChatStyle.sendArea.height + ChatStyle.sendArea.border.width
+						height: visible ? ChatStyle.sendArea.height + ChatStyle.sendArea.border.width : 0
 						minimumHeight:ChatStyle.sendArea.height + ChatStyle.sendArea.border.width
 						maximumHeight:container.height/2
 						
diff --git a/linphone-sdk b/linphone-sdk
index e5c95eaed..2cf715cb4 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit e5c95eaed5a2113cbba1ab62e8baa826abe7609c
+Subproject commit 2cf715cb4615c8115aa0102738bc3f28c6302765