diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 07613f337..2927d6029 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -30,6 +30,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.net.Uri
+import android.os.Bundle
 import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
@@ -1199,18 +1200,17 @@ class NotificationsManager @MainThread constructor(private val context: Context)
 
     @WorkerThread
     private fun getChatRoomPendingIntent(chatRoom: ChatRoom): PendingIntent {
-        val mainActivityIntent = Intent(context, MainActivity::class.java)
-        mainActivityIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        mainActivityIntent.setAction(Intent.ACTION_MAIN)
-        mainActivityIntent.putExtra("Chat", true)
-        mainActivityIntent.putExtra("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
-        mainActivityIntent.putExtra("LocalSipUri", chatRoom.localAddress.asStringUriOnly())
-        return PendingIntent.getActivity(
-            context,
-            0,
-            mainActivityIntent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
+        val args = Bundle()
+        args.putBoolean("Chat", true)
+        args.putString("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
+        args.putString("LocalSipUri", chatRoom.localAddress.asStringUriOnly())
+
+        return NavDeepLinkBuilder(context)
+            .setComponentName(MainActivity::class.java)
+            .setGraph(R.navigation.main_nav_graph)
+            .setDestination(R.id.conversationsListFragment)
+            .setArguments(args)
+            .createPendingIntent()
     }
 
     class Notifiable(val notificationId: Int) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
index 6f616d494..831382594 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
@@ -326,13 +326,6 @@ class ConversationFragment : SlidingPaneChildFragment() {
                         (requireActivity() as MainActivity).showRedToast(message, R.drawable.x)
                     }
                 } else {
-                    if (viewModel.isEndToEndEncrypted.value == true) {
-                        Log.i("$TAG Conversation is end-to-end encrypted, showing toast")
-                        val message = getString(R.string.toast_end_to_end_encrypted_conversation)
-                        val icon = R.drawable.media_encryption_srtp
-                        (requireActivity() as MainActivity).showBlueToast(message, icon)
-                    }
-
                     sendMessageViewModel.configureChatRoom(viewModel.chatRoom)
 
                     // Wait for chat room to be ready before trying to forward a message in it