diff --git a/linphone-app/src/components/chat-room/ChatRoomModel.cpp b/linphone-app/src/components/chat-room/ChatRoomModel.cpp
index 99f99862b..cad2ea744 100644
--- a/linphone-app/src/components/chat-room/ChatRoomModel.cpp
+++ b/linphone-app/src/components/chat-room/ChatRoomModel.cpp
@@ -494,7 +494,7 @@ QList<QString> ChatRoomModel::getComposers(){
 	return mComposers.values();
 }
 
-QString ChatRoomModel::getParticipantAddress(){
+QString ChatRoomModel::getParticipantAddress() const{
 	if(!isSecure()){
 		auto peerAddress = mChatRoom->getPeerAddress();
 		if( peerAddress)
diff --git a/linphone-app/src/components/chat-room/ChatRoomModel.hpp b/linphone-app/src/components/chat-room/ChatRoomModel.hpp
index 4c25d05e6..c49e59d98 100644
--- a/linphone-app/src/components/chat-room/ChatRoomModel.hpp
+++ b/linphone-app/src/components/chat-room/ChatRoomModel.hpp
@@ -114,7 +114,8 @@ public:
 	Q_INVOKABLE QString getFullPeerAddress () const;
 	Q_INVOKABLE QString getFullLocalAddress () const;
 	Q_INVOKABLE QString getConferenceAddress () const;
-	
+	Q_INVOKABLE QString getParticipantAddress() const;	// return peerAddress if not secure else return the first participant SIP address.
+		
 	QString getSubject () const;
 	QString getUsername () const;
 	QString getAvatar () const;
@@ -144,7 +145,6 @@ public:
 	std::list<std::shared_ptr<linphone::Participant>> getParticipants(const bool& withMe = true) const;
 	std::shared_ptr<linphone::ChatRoom> getChatRoom();
 	QList<QString> getComposers();
-	QString getParticipantAddress();	// return peerAddress if not secure else return the first participant SIP address.
 	int getAllUnreadCount();	// Return unread messages and missed call.
 		
 //---- Setters
diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml
index 13d284f66..6089cd13d 100644
--- a/linphone-app/ui/views/App/Main/Conversation.qml
+++ b/linphone-app/ui/views/App/Main/Conversation.qml
@@ -30,7 +30,6 @@ ColumnLayout  {
 	
 	
 	property ChatRoomModel chatRoomModel
-	property string peerAddress : getPeerAddress()
 	property string localAddress : chatRoomModel?chatRoomModel.getLocalAddress() : defaultLocalAddress
 	property string fullPeerAddress : getFullPeerAddress()
 	property string fullLocalAddress : chatRoomModel?chatRoomModel.getFullLocalAddress() : defaultFullLocalAddress
@@ -42,21 +41,10 @@ ColumnLayout  {
 	property bool haveMoreThanOneParticipants: chatRoomModel ? chatRoomModel.participants.count > 2 : false
 	property bool haveLessThanMinParticipantsForCall: chatRoomModel ? chatRoomModel.participants.count <= 5 : false
 	
-	function getPeerAddress() {
-		if(chatRoomModel) {
-			if(chatRoomModel.groupEnabled || chatRoomModel.isSecure()) {
-				return chatRoomModel.getPeerAddress();
-			}else {
-				return chatRoomModel.sipAddress;
-			}
-		}else {
-			return defaultPeerAddress
-		}	
-	}
 	function getFullPeerAddress() {
 		if(chatRoomModel) {
 			if(chatRoomModel.groupEnabled || chatRoomModel.isSecure()) {
-				return chatRoomModel.getFullPeerAddress()
+				return chatRoomModel.getParticipantAddress()
 			}else {
 				return chatRoomModel.sipAddress;
 			}