diff --git a/app/src/main/java/app/closer/core/navigation/AppNavigation.kt b/app/src/main/java/app/closer/core/navigation/AppNavigation.kt
index 30ef0522..fd8d1f7f 100644
--- a/app/src/main/java/app/closer/core/navigation/AppNavigation.kt
+++ b/app/src/main/java/app/closer/core/navigation/AppNavigation.kt
@@ -3,6 +3,7 @@ package app.closer.core.navigation
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.Chat
 import androidx.compose.material.icons.filled.Favorite
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.PlayArrow
@@ -66,6 +67,8 @@ import app.closer.ui.questions.QuestionCategoryScreen
 import app.closer.ui.questions.QuestionComposerScreen
 import app.closer.ui.questions.QuestionPackLibraryScreen
 import app.closer.ui.questions.QuestionThreadScreen
+import app.closer.ui.messages.MessagesInboxScreen
+import app.closer.ui.messages.ConversationScreen
 import app.closer.ui.settings.AccountScreen
 import app.closer.ui.settings.AppearanceScreen
 import app.closer.ui.settings.DeleteAccountScreen
@@ -240,6 +243,21 @@ fun AppNavigation(
             composable(route = AppRoute.QUESTION_PACKS) {
                 QuestionPackLibraryScreen(onNavigate = navigateRoute)
             }
+            composable(route = AppRoute.MESSAGES) {
+                MessagesInboxScreen(onNavigate = navigateRoute)
+            }
+            composable(
+                route = AppRoute.CONVERSATION,
+                arguments = listOf(
+                    navArgument("coupleId") { type = NavType.StringType },
+                    navArgument("conversationId") { type = NavType.StringType }
+                ),
+                deepLinks = listOf(
+                    navDeepLink { uriPattern = "closer://closer.app/conversation/{coupleId}/{conversationId}" }
+                )
+            ) {
+                ConversationScreen(onNavigate = navigateRoute)
+            }
             composable(
                 route = AppRoute.QUESTION_CATEGORY,
                 arguments = listOf(navArgument("categoryId") { type = NavType.StringType })
@@ -517,7 +535,7 @@ fun AppNavigation(
         // Floating in-app chat-head for incoming partner messages — drifts over every screen,
         // draggable, tap to open the conversation.
         app.closer.ui.components.MessageBubbleOverlay(
-            onOpen = { c, q -> navigateRoute(AppRoute.questionThread(c, q)) }
+            onOpen = { c, conv -> navigateRoute(AppRoute.conversation(c, conv)) }
         )
     }
 }
@@ -532,7 +550,7 @@ private val topLevelRoutes = listOf(
     TopLevelRoute(AppRoute.HOME, "Home", Icons.Filled.Home),
     TopLevelRoute(AppRoute.DAILY_QUESTION, "Today", Icons.Filled.Favorite),
     TopLevelRoute(AppRoute.PLAY, "Play", Icons.Filled.PlayArrow),
-    TopLevelRoute(AppRoute.QUESTION_PACKS, "Packs", Icons.Filled.Star),
+    TopLevelRoute(AppRoute.MESSAGES, "Messages", Icons.AutoMirrored.Filled.Chat),
     TopLevelRoute(AppRoute.SETTINGS, "Settings", Icons.Filled.Settings)
 )
 
diff --git a/app/src/main/java/app/closer/core/navigation/AppRoute.kt b/app/src/main/java/app/closer/core/navigation/AppRoute.kt
index 1c23b1f0..f46c0ad9 100644
--- a/app/src/main/java/app/closer/core/navigation/AppRoute.kt
+++ b/app/src/main/java/app/closer/core/navigation/AppRoute.kt
@@ -14,6 +14,8 @@ object AppRoute {
     const val PLAY = "play"
     const val DAILY_QUESTION = "daily_question"
     const val QUESTION_PACKS = "question_packs"
+    const val MESSAGES = "messages"
+    const val CONVERSATION = "conversation/{coupleId}/{conversationId}"
     const val QUESTION_CATEGORY = "question_category/{categoryId}"
     const val QUESTION_COMPOSER = "question_composer"
     const val ANSWER_REVEAL = "answer_reveal/{questionId}"
@@ -85,6 +87,8 @@ object AppRoute {
         Definition(PLAY, "Play", "play"),
         Definition(DAILY_QUESTION, "Daily Question", "questions"),
         Definition(QUESTION_PACKS, "Question Packs", "questions"),
+        Definition(MESSAGES, "Messages", "messages"),
+        Definition(CONVERSATION, "Conversation", "messages"),
         Definition(QUESTION_CATEGORY, "Question Pack", "questions"),
         Definition(QUESTION_COMPOSER, "New Question", "questions"),
         Definition(QUESTION_THREAD, "Answer", "questions"),
@@ -132,7 +136,7 @@ object AppRoute {
         HOME,
         DAILY_QUESTION,
         PLAY,
-        QUESTION_PACKS,
+        MESSAGES,
         SETTINGS
     )
 
@@ -191,6 +195,9 @@ object AppRoute {
 
     fun answerReveal(questionId: String): String = "answer_reveal/${questionId.asRouteArg()}"
 
+    fun conversation(coupleId: String, conversationId: String): String =
+        "conversation/${coupleId.asRouteArg()}/${conversationId.asRouteArg()}"
+
     fun inviteConfirm(inviteCode: String): String = "invite_confirm/${inviteCode.asRouteArg()}"
 
     fun questionCategory(categoryId: String): String = "question_category/${categoryId.asRouteArg()}"
diff --git a/app/src/main/java/app/closer/ui/answers/AnswerRevealScreen.kt b/app/src/main/java/app/closer/ui/answers/AnswerRevealScreen.kt
index 9af96405..48bf6968 100644
--- a/app/src/main/java/app/closer/ui/answers/AnswerRevealScreen.kt
+++ b/app/src/main/java/app/closer/ui/answers/AnswerRevealScreen.kt
@@ -92,7 +92,7 @@ fun AnswerRevealScreen(
         onAnswerQuestion = {
             val coupleId = state.coupleId
             if (coupleId != null) {
-                onNavigate(AppRoute.questionThread(coupleId, questionId))
+                onNavigate(AppRoute.conversation(coupleId, "q_" + questionId))
             } else {
                 // Discussing requires a paired partner; send unpaired users to invite one.
                 onNavigate(AppRoute.CREATE_INVITE)
diff --git a/app/src/main/java/app/closer/ui/play/PlayHubScreen.kt b/app/src/main/java/app/closer/ui/play/PlayHubScreen.kt
index 467ed74d..d58bd97e 100644
--- a/app/src/main/java/app/closer/ui/play/PlayHubScreen.kt
+++ b/app/src/main/java/app/closer/ui/play/PlayHubScreen.kt
@@ -144,6 +144,18 @@ private fun PlayHubContent(
                 )
             }
 
+            // Question Packs — moved here from the bottom bar (which now hosts Messages).
+            item {
+                CompactPlayCard(
+                    title = "Question Packs",
+                    subtitle = "Themed prompts to explore together",
+                    icon = Icons.Filled.Star,
+                    tint = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = { onNavigate(AppRoute.QUESTION_PACKS) }
+                )
+            }
+
             item {
                 Row(
                     modifier = Modifier.fillMaxWidth(),
diff --git a/app/src/main/java/app/closer/ui/questions/DailyQuestionScreen.kt b/app/src/main/java/app/closer/ui/questions/DailyQuestionScreen.kt
index 32f00b16..4dcbc739 100644
--- a/app/src/main/java/app/closer/ui/questions/DailyQuestionScreen.kt
+++ b/app/src/main/java/app/closer/ui/questions/DailyQuestionScreen.kt
@@ -40,7 +40,7 @@ fun DailyQuestionScreen(
         onPrimaryRoute = { question ->
             val coupleId = state.coupleId
             if (coupleId != null) {
-                onNavigate(AppRoute.questionThread(coupleId, question.id))
+                onNavigate(AppRoute.conversation(coupleId, "q_" + question.id))
             } else {
                 onNavigate(AppRoute.CREATE_INVITE)
             }