diff --git a/linphone-app/src/components/chat/ChatProxyModel.cpp b/linphone-app/src/components/chat/ChatProxyModel.cpp
index b9a0241b9..6283fee7d 100644
--- a/linphone-app/src/components/chat/ChatProxyModel.cpp
+++ b/linphone-app/src/components/chat/ChatProxyModel.cpp
@@ -178,6 +178,7 @@ QString ChatProxyModel::getFullPeerAddress () const {
 
 void ChatProxyModel::setFullPeerAddress (const QString &peerAddress) {
   mFullPeerAddress = peerAddress;
+  reload();
 }
 
 QString ChatProxyModel::getFullLocalAddress () const {
@@ -186,6 +187,7 @@ QString ChatProxyModel::getFullLocalAddress () const {
 
 void ChatProxyModel::setFullLocalAddress (const QString &localAddress) {
   mFullLocalAddress = localAddress;
+  reload();
 }
 
 bool ChatProxyModel::getIsRemoteComposing () const {
@@ -204,7 +206,7 @@ void ChatProxyModel::reload () {
     QObject::disconnect(chatModel, &ChatModel::messageSent, this, &ChatProxyModel::handleMessageSent);
   }
 
-  mChatModel = CoreManager::getInstance()->getChatModel(mPeerAddress, mLocalAddress);
+  mChatModel = CoreManager::getInstance()->getChatModel(mFullPeerAddress, mFullLocalAddress);
 
   if (mChatModel) {
     mChatModel->resetMessageCount();
diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.qml b/linphone-app/ui/views/App/Calls/CallsWindow.qml
index 10c21d671..6d2c39537 100644
--- a/linphone-app/ui/views/App/Calls/CallsWindow.qml
+++ b/linphone-app/ui/views/App/Calls/CallsWindow.qml
@@ -199,6 +199,8 @@ Window {
 
             peerAddress: (call?call.peerAddress:'')
             localAddress: (call?call.localAddress:'')
+            fullPeerAddress: (call?call.fullPeerAddress:'')
+            fullLocalAddress: (call?call.fullLocalAddress:'')
           }
 
           Connections {
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index 6a3c5f783..936e9f001 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -266,7 +266,9 @@ ApplicationWindow {
 
             onEntrySelected: setView('Conversation', {
               peerAddress: entry,
-              localAddress: AccountSettingsModel.sipAddress
+              localAddress: AccountSettingsModel.sipAddress,
+              fullPeerAddress: entry,
+              fullLocalAddress: AccountSettingsModel.fullSipAddress
             })
           }
         }
@@ -295,7 +297,9 @@ ApplicationWindow {
 
     onSip: window.setView('Conversation', {
       peerAddress: sipAddress,
-      localAddress: AccountSettingsModel.sipAddress
+      localAddress: AccountSettingsModel.sipAddress,
+      fullPeerAddress: sipAddress,
+      fullLocalAddress: AccountSettingsModel.fullSipAddress
     })
   }
 }
diff --git a/linphone-sdk b/linphone-sdk
index 8b2d2c7a9..b8ee78d2e 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 8b2d2c7a952f4f074b5fe154a21a46f9225e403b
+Subproject commit b8ee78d2ed3212cf493703e17ad8c5181edcb7e2