diff --git a/app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt b/app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt
index c0b7059ff..0af19c4e5 100644
--- a/app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt
+++ b/app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt
@@ -216,7 +216,6 @@ fun NavDestination.isNodeDetailRoute(): Boolean {
 fun NavDestination.showLongNameTitle(): Boolean {
 
     return !this.isTopLevel() && (
-            this.hasRoute<Route.Messages>() ||
             this.hasRoute<Route.RadioConfig>() ||
                     this.hasRoute<Route.NodeDetail>() ||
                     this.isConfigRoute() ||
diff --git a/app/src/main/java/com/geeksville/mesh/ui/Main.kt b/app/src/main/java/com/geeksville/mesh/ui/Main.kt
index 50bc6a779..6577e25a1 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Main.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Main.kt
@@ -166,6 +166,9 @@ private fun MainAppBar(
     val canNavigateBack = navController.previousBackStackEntry != null
     val isTopLevelRoute = currentDestination?.isTopLevel() == true
     val navigateUp: () -> Unit = navController::navigateUp
+    if (currentDestination?.hasRoute<Route.Messages>() == true) {
+        return
+    }
     TopAppBar(
         title = {
             when {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
index 897a0b7e7..f2134de36 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
@@ -387,8 +387,7 @@ private fun TextInput(
                 message.value = it
             }
         },
-        modifier = Modifier
-            .weight(1f)
+        modifier = Modifier.fillMaxWidth()
             .onFocusEvent { isFocused = it.isFocused },
         enabled = enabled,
         placeholder = { Text(stringResource(id = R.string.send_text)) },