diff --git a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml
index 8151fa5d8..f95cd2f45 100644
--- a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml
+++ b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml
@@ -16,7 +16,6 @@ ColumnLayout {
 
 	property FriendGui contact
 	property var conferenceInfo: callHistoryGui?.core.conferenceInfo
-	property var chatGui: callHistoryGui?.core.chatGui
 	property bool isConference: conferenceInfo != undefined && conferenceInfo != null
 	property string contactAddress: specificAddress != "" ? specificAddress : contact && contact.core.defaultAddress || ""
 	property var computedContactNameObj: UtilsCpp.getDisplayName(contactAddress)
@@ -126,13 +125,12 @@ ColumnLayout {
 	}
 	RowLayout {
 		id: confWithChatLayout
-		visible: mainItem.isConference && !SettingsCpp.disableMeetingsFeature && mainItem.chatGui !== null
+		visible: mainItem.isConference && !SettingsCpp.disableMeetingsFeature && mainItem.callHistoryGui?.core.hasChat
 		Layout.alignment: Qt.AlignHCenter
         spacing: Utils.getSizeWithScreenRatio(72)
 		// Layout.fillWidth: true
 		Layout.preferredHeight: childrenRect.height
 		LabelButton {
-			visible: !SettingsCpp.disableChatFeature
             width: Utils.getSizeWithScreenRatio(56)
             height: Utils.getSizeWithScreenRatio(56)
             button.icon.width: Utils.getSizeWithScreenRatio(24)
@@ -152,7 +150,7 @@ ColumnLayout {
             height: Utils.getSizeWithScreenRatio(56)
             button.icon.width: Utils.getSizeWithScreenRatio(24)
             button.icon.height: Utils.getSizeWithScreenRatio(24)
-            button.icon.source: button.checked ? AppIcons.callList : AppIcons.chatTeardropText
+            button.icon.source: AppIcons.chatTeardropText
             //: "Conversation"
 			label: qsTr("contact_conversation_action")
 			button.onPressed: {
diff --git a/Linphone/view/Control/Display/Chat/ChatMessage.qml b/Linphone/view/Control/Display/Chat/ChatMessage.qml
index 5de419f2a..128b65496 100644
--- a/Linphone/view/Control/Display/Chat/ChatMessage.qml
+++ b/Linphone/view/Control/Display/Chat/ChatMessage.qml
@@ -265,6 +265,7 @@ Control.Control {
                             Layout.fillWidth: true
                             Layout.fillHeight: true
                             text: mainItem.chatMessage.core.text
+                            textFormat: Text.RichText
                         }
                         ChatMessageContent {
                             id: chatBubbleContent
diff --git a/Linphone/view/Control/Display/Contact/ContactListItem.qml b/Linphone/view/Control/Display/Contact/ContactListItem.qml
index bc8458b3a..f8155d148 100644
--- a/Linphone/view/Control/Display/Contact/ContactListItem.qml
+++ b/Linphone/view/Control/Display/Contact/ContactListItem.qml
@@ -105,7 +105,7 @@ FocusScope {
                         ? UtilsCpp.getUsername(mainItem.addressFromFilter)
                         : mainItem.addressFromFilter
                     text: UtilsCpp.boldTextPart(address, mainItem.highlightText)
-                    textFormat: Text.AutoText
+                    textFormat: Text.RichText
                     maximumLineCount: 1
                     elide: Text.ElideRight
                     font {
diff --git a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml
index 340c834dd..0d082c640 100644
--- a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml
+++ b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml
@@ -172,7 +172,7 @@ ColumnLayout {
 	BigButton {
 		Layout.preferredHeight: height
 		height: implicitHeight
-        visible: mainItem.screenSharingAvailable$
+        visible: mainItem.screenSharingAvailable
 		enabled: mainItem.isLocalScreenSharing || windowsLayout.currentIndex !== -1 || screensLayout.currentIndex !== -1
 		text:  mainItem.conference && mainItem.conference.core.isLocalScreenSharing
         //: "Stop
@@ -184,4 +184,4 @@ ColumnLayout {
 		}
 		style: ButtonStyle.main
 	}
-}
+}
\ No newline at end of file
diff --git a/Linphone/view/Control/Popup/InformationPopup.qml b/Linphone/view/Control/Popup/InformationPopup.qml
index 7d407da8b..85f801918 100644
--- a/Linphone/view/Control/Popup/InformationPopup.qml
+++ b/Linphone/view/Control/Popup/InformationPopup.qml
@@ -61,6 +61,7 @@ Popup {
 				Text {
 					Layout.fillWidth: true
 					text: mainItem.title
+					textFormat: Text.RichText
 					color: mainItem.isSuccess ? DefaultStyle.success_500_main : DefaultStyle.danger_500_main
 					font {
                         pixelSize: Typography.h4.pixelSize
diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
index e7a626f57..58f13cd34 100644
--- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml
+++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml
@@ -35,6 +35,11 @@ FocusScope {
     onActiveFocusChanged: if(activeFocus) {
         if (chatMessagesListView.lastItemVisible) chat.core.lMarkAsRead()
     }
+    onChatChanged: {
+        chatMessage = null
+        replyingToMessage = false
+        editingMessage = false
+    }
     MouseArea{
         anchors.fill: parent
         onPressed: {
@@ -476,7 +481,7 @@ FocusScope {
                             ColumnLayout {
                                 id: replyLayout
                                 spacing: 0
-                                visible: mainItem.chatMessage && (mainItem.replyingToMessage || mainItem.editingMessage)
+                                visible: mainItem.chatMessage && (mainItem.replyingToMessage || mainItem.editingMessage)
                                 Text {
                                     Layout.fillWidth: true
                                     //: Reply to %1
@@ -617,6 +622,7 @@ FocusScope {
                 color: DefaultStyle.grey_0
                 anchors.fill: parent
                 RoundButton {
+                    visible: contentLoader.panelType === SelectedChatView.PanelType.None
                     style: ButtonStyle.noBackgroundOrange
                     icon.source: AppIcons.leftArrow
                     onClicked: detailsPanel.visible = false
diff --git a/Linphone/view/Page/Form/Register/RegisterPage.qml b/Linphone/view/Page/Form/Register/RegisterPage.qml
index e00e3020a..9b83cc7da 100644
--- a/Linphone/view/Page/Form/Register/RegisterPage.qml
+++ b/Linphone/view/Page/Form/Register/RegisterPage.qml
@@ -281,6 +281,7 @@ LoginLayout {
                         Text {
 							id: privacyLinkText
                             text: acceptCguAndPrivacyPolicyItem.associatedText
+							textFormat: Text.RichText
                             onLinkActivated: (link) => Qt.openUrlExternally(link)
                             font {
                                 pixelSize: Typography.p1.pixelSize
diff --git a/Linphone/view/Page/Main/Start/WelcomePage.qml b/Linphone/view/Page/Main/Start/WelcomePage.qml
index 811e71694..994adf9cd 100644
--- a/Linphone/view/Page/Main/Start/WelcomePage.qml
+++ b/Linphone/view/Page/Main/Start/WelcomePage.qml
@@ -96,6 +96,7 @@ LoginLayout {
 						Text {
 							id: title
 							text: modelData.title
+							textFormat: Text.RichText
 							font {
                                 pixelSize: Typography.h2.pixelSize
                                 weight: Typography.h2.weight
@@ -105,6 +106,7 @@ LoginLayout {
 							id: txt
                             Layout.maximumWidth: Utils.getSizeWithScreenRatio(361)
                             wrapMode: Text.WordWrap
+							textFormat: Text.RichText
                             font {
                                 pixelSize: Typography.p1.pixelSize
                                 weight: Typography.p1.weight