diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index 90bf4f83dd..099071bc19 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -2156,7 +2156,7 @@ class TimelineFragment @Inject constructor(
                 ).show(childFragmentManager, "JSON_VIEWER")
             }
             is EventSharedAction.ViewEventE2EInformation    -> {
-                MessageE2EInfoActivity.getIntent(requireContext(), roomDetailArgs.roomId, action.eventId).let {
+                MessageE2EInfoActivity.getIntent(requireContext(), timelineArgs.roomId, action.eventId).let {
                     startActivity(it)
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/e2einfo/MessageE2EInfoActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/e2einfo/MessageE2EInfoActivity.kt
index b18cb461ac..54e0c87570 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/e2einfo/MessageE2EInfoActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/e2einfo/MessageE2EInfoActivity.kt
@@ -43,7 +43,9 @@ class MessageE2EInfoActivity : SimpleFragmentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        configureToolbar(views.toolbar, true)
+        setupToolbar(views.toolbar)
+                .setTitle(title)
+                .allowBack(useCross = true)
 
         if (isFirstCreation()) {
             val fragmentArgs: EncryptedMessageInfoArg = intent?.extras?.getParcelable(Mavericks.KEY_ARG) ?: return
@@ -88,11 +90,7 @@ class MessageE2EInfoActivity : SimpleFragmentActivity() {
     }
 
     private fun updateTitle(title: String) {
-        supportActionBar?.let {
-            it.title = title
-        } ?: run {
-            setTitle(title)
-        }
+        toolbar?.setTitle(title)
     }
 
     override fun onPrepareOptionsMenu(menu: Menu?): Boolean {