diff --git a/app/src/main/java/com/example/reply/ui/ReplyDetailsScreen.kt b/app/src/main/java/com/example/reply/ui/ReplyDetailsScreen.kt
index e16b798..2dc9174 100644
--- a/app/src/main/java/com/example/reply/ui/ReplyDetailsScreen.kt
+++ b/app/src/main/java/com/example/reply/ui/ReplyDetailsScreen.kt
@@ -16,6 +16,7 @@
 package com.example.reply.ui
 
 import android.widget.Toast
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -57,6 +58,9 @@ fun ReplyDetailsScreen(
     onBackPressed: () -> Unit,
     modifier: Modifier = Modifier
 ) {
+    BackHandler {
+        onBackPressed()
+    }
     Box(modifier = modifier) {
         LazyColumn(
             contentPadding = WindowInsets.safeDrawing.asPaddingValues(),
@@ -171,6 +175,7 @@ private fun DetailsScreenButtonBar(
     displayToast: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
+
     Box(modifier = modifier) {
         when (mailboxType) {
             MailboxType.Drafts ->
diff --git a/app/src/main/java/com/example/reply/ui/ReplyHomeScreen.kt b/app/src/main/java/com/example/reply/ui/ReplyHomeScreen.kt
index 4924d93..36bc6b1 100644
--- a/app/src/main/java/com/example/reply/ui/ReplyHomeScreen.kt
+++ b/app/src/main/java/com/example/reply/ui/ReplyHomeScreen.kt
@@ -81,13 +81,23 @@ fun ReplyHomeScreen(
             text = stringResource(id = R.string.tab_spam)
         )
     )
-    ReplyAppContent(
-        replyUiState = replyUiState,
-        onTabPressed = onTabPressed,
-        onEmailCardPressed = onEmailCardPressed,
-        navigationItemContentList = navigationItemContentList,
-        modifier = modifier
-    )
+    if(replyUiState.isShowingHomepage){
+
+        ReplyAppContent(
+            replyUiState = replyUiState,
+            onTabPressed = onTabPressed,
+            onEmailCardPressed = onEmailCardPressed,
+            navigationItemContentList = navigationItemContentList,
+            modifier = modifier
+        )
+    }
+    else{
+        ReplyDetailsScreen(
+            replyUiState = replyUiState,
+            onBackPressed = onDetailScreenBackPressed,
+            modifier = modifier
+        )
+    }
 }
 
 @Composable