diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/NewMessageDetailsFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/NewMessageDetailsFragment.java
new file mode 100644
index 000000000..d894552f3
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/NewMessageDetailsFragment.java
@@ -0,0 +1,14 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment;
+
+import androidx.fragment.app.Fragment;
+
+/**
+ * @author Denys Bondarenko
+ */
+public class NewMessageDetailsFragment extends Fragment {
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FragmentsAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FragmentsAdapter.kt
index 5af69cccc..58568ac4c 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FragmentsAdapter.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FragmentsAdapter.kt
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.flowcrypt.email.api.email.model.LocalFolder
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.ui.activity.fragment.MessageDetailsFragment
-import com.flowcrypt.email.ui.activity.fragment.MessageDetailsFragmentArgs
+import com.flowcrypt.email.ui.activity.fragment.NewMessageDetailsFragment
+import com.flowcrypt.email.ui.activity.fragment.NewMessageDetailsFragmentArgs
 
 /**
  * @author Denys Bondarenko
@@ -45,10 +45,9 @@ class FragmentsAdapter(
   override fun getItemCount(): Int = asyncListDiffer.currentList.size
 
   override fun createFragment(position: Int): Fragment =
-    MessageDetailsFragment().apply {
-      arguments = MessageDetailsFragmentArgs(
-        messageEntity = asyncListDiffer.currentList[position],
-        localFolder = localFolder,
+    NewMessageDetailsFragment().apply {
+      arguments = NewMessageDetailsFragmentArgs(
+        messageEntityId = requireNotNull(asyncListDiffer.currentList[position].id),
         isViewPagerMode = true
       ).toBundle()
     }
diff --git a/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml
new file mode 100644
index 000000000..0361973f4
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/fragment_new_message_details.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: denbond7
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/FlowCrypt/src/main/res/navigation/nav_graph.xml b/FlowCrypt/src/main/res/navigation/nav_graph.xml
index dd99423ab..bb76a5e34 100644
--- a/FlowCrypt/src/main/res/navigation/nav_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/nav_graph.xml
@@ -326,6 +326,19 @@
             android:defaultValue="false" />
     </fragment>
 
+    <fragment
+        android:id="@+id/newMessageDetailsFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.NewMessageDetailsFragment"
+        tools:layout="@layout/fragment_new_message_details">
+        <argument
+            android:name="messageEntityId"
+            app:argType="long" />
+        <argument
+            android:name="isViewPagerMode"
+            app:argType="boolean"
+            android:defaultValue="false" />
+    </fragment>
+
     <fragment
         android:id="@+id/searchBackupsInEmailFragment"
         android:name="com.flowcrypt.email.ui.activity.fragment.SearchBackupsInEmailFragment"