diff --git a/linphone-app/src/components/chat-room/ChatRoomModel.hpp b/linphone-app/src/components/chat-room/ChatRoomModel.hpp
index 91fad5a32..dd0798bfe 100644
--- a/linphone-app/src/components/chat-room/ChatRoomModel.hpp
+++ b/linphone-app/src/components/chat-room/ChatRoomModel.hpp
@@ -183,7 +183,7 @@ public:
 	bool isEphemeralEnabled() const;
 	long getEphemeralLifetime() const;
 	bool canBeEphemeral();
-	Q_INVOKABLE bool haveEncryption() const;
+	bool haveEncryption() const;
 	Q_INVOKABLE bool isSecure() const;
 	int getSecurityLevel() const;
 	bool isGroupEnabled() const;
diff --git a/linphone-app/src/components/timeline/TimelineModel.cpp b/linphone-app/src/components/timeline/TimelineModel.cpp
index c17fdc572..d5273c379 100644
--- a/linphone-app/src/components/timeline/TimelineModel.cpp
+++ b/linphone-app/src/components/timeline/TimelineModel.cpp
@@ -95,7 +95,7 @@ void TimelineModel::setSelected(const bool& selected){
 				<< ", isConference:"<< mChatRoomModel->isConference()
 				<< ", isOneToOne:"<< mChatRoomModel->isOneToOne()
 				<< ", Encrypted:"<< mChatRoomModel->haveEncryption()
-				<< ", ephemeralEnabled:" << mChatRoomModel->haveEncryption()
+				<< ", ephemeralEnabled:" << mChatRoomModel->isEphemeralEnabled()
 				<< ", isAdmin:"<< mChatRoomModel->isMeAdmin()
 				<< ", canHandleParticipants:"<< mChatRoomModel->canHandleParticipants()
 				<< ", hasBeenLeft:" << mChatRoomModel->hasBeenLeft();
diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
index 92de4f662..4399e3f83 100644
--- a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
+++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
@@ -78,11 +78,7 @@ Notification {
       AccountSettingsModel.setDefaultProxyConfigFromSipAddress(notification.localAddress)
       notification.timelineModel.selected = true
       notification.notificationData.window.setView('Conversation', {
-		chatRoomModel:notification.timelineModel.getChatRoomModel()/*,
-        peerAddress: notification.peerAddress,
-        localAddress: notification.localAddress,
-        fullPeerAddress: notification.fullPeerAddress,
-        fullLocalAddress: notification.fullLocalAddress*/
+		chatRoomModel:notification.timelineModel.getChatRoomModel()
       })
     })
   }
diff --git a/linphone-sdk b/linphone-sdk
index 235a49a0e..90d0649aa 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 235a49a0e6a17055cf9cf756b80452d88ee45f83
+Subproject commit 90d0649aa68f0730817eaef9930522700ceb0253