diff --git a/app/src/main/java/net/buzzert/kordophonedroid/ui/messagelist/MessageListScreen.kt b/app/src/main/java/net/buzzert/kordophonedroid/ui/messagelist/MessageListScreen.kt
index 85405ec..f0dadfc 100644
--- a/app/src/main/java/net/buzzert/kordophonedroid/ui/messagelist/MessageListScreen.kt
+++ b/app/src/main/java/net/buzzert/kordophonedroid/ui/messagelist/MessageListScreen.kt
@@ -1,5 +1,6 @@
 package net.buzzert.kordophonedroid.ui.messagelist
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
@@ -155,14 +156,14 @@ private fun MessageEntry(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .height(64.dp)
             .padding(8.dp)
-            .background(MaterialTheme.colors.secondary)
     ) {
-        Surface {
+        Surface(
+            shape = RoundedCornerShape(8.dp),
+            border = BorderStroke(1.dp, color = MaterialTheme.colors.onBackground.copy(0.4f))
+        ) {
             Row(modifier = Modifier
-                .padding(8.dp)
-                .height(64.dp)
+                .padding(horizontal = 8.dp)
                 .weight(1f)
                 .align(Alignment.Bottom)
                 .imePadding()