diff --git a/app/src/main/java/net/buzzert/kordophonedroid/ui/conversationlist/ConversationListScreen.kt b/app/src/main/java/net/buzzert/kordophonedroid/ui/conversationlist/ConversationListScreen.kt
index 226fc3c..43f8d42 100644
--- a/app/src/main/java/net/buzzert/kordophonedroid/ui/conversationlist/ConversationListScreen.kt
+++ b/app/src/main/java/net/buzzert/kordophonedroid/ui/conversationlist/ConversationListScreen.kt
@@ -131,9 +131,10 @@ fun ConversationListItem(
                     style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.Bold),
                     overflow = TextOverflow.Ellipsis,
                     maxLines = 1,
+                    modifier = Modifier.weight(1f, fill = true)
                 )
 
-                Spacer(Modifier.weight(1f))
+                Spacer(modifier = Modifier)
 
                 Text(
                     formatDateTime(
@@ -141,9 +142,11 @@ fun ConversationListItem(
                             .atZone(ZoneId.systemDefault())
                             .toLocalDateTime()
                     ),
-                    modifier = Modifier.align(Alignment.CenterVertically),
                     color = MaterialTheme.colors.onBackground.copy(alpha = 0.4f),
                     maxLines = 1,
+                    modifier = Modifier
+                        .align(Alignment.CenterVertically)
+                    ,
                 )
 
                 Spacer(Modifier.width(horizontalPadding))
@@ -175,7 +178,7 @@ fun UnreadIndicator(size: Dp, modifier: Modifier = Modifier) {
 @Composable
 fun ConversationListItemPreview() {
     Column(modifier = Modifier.background(MaterialTheme.colors.background)) {
-        ConversationListItem(name = "James MagahernMagahernMagahernMagahernMagahernMagahernMagahern", id = "asdf", lastMessagePreview = "This is a test", date = Date(), isUnread = true) {}
+        ConversationListItem(name = "James Magahern", id = "asdf", lastMessagePreview = "This is a test", date = Date(), isUnread = true) {}
     }
 }