diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml
index 607e624c4..f3d6c0285 100644
--- a/linphone-app/ui/views/App/Main/Conversation.qml
+++ b/linphone-app/ui/views/App/Main/Conversation.qml
@@ -218,6 +218,12 @@ ColumnLayout  {
 						
 						onClicked: CallsListModel.launchAudioCall(conversation.peerAddress)
 					}
+					ActionButton {
+						icon: 'chat'
+						visible: SettingsModel.chatEnabled && SettingsModel.getShowStartChatButton() && !conversation.chatRoomModel.groupEnabled && conversation.securityLevel != 1
+						
+						onClicked: CallsListModel.launchChat(conversation.peerAddress, 0)
+					}
 					
 					ActionButton {
 						icon: 'group_chat'
diff --git a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
index 7ddef36b5..16c2787a9 100644
--- a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
+++ b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
@@ -51,7 +51,7 @@ DialogPlus {
 				property int securityLevel : modelData.securityLevel
 				property string addressToCall : modelData.sipAddress
 						
-				width:parent.width
+				width: parent ? parent.width : undefined
 				spacing: 0
 				RowLayout {
 					id: item