diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
index eaef076c63..57e0970b0e 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
@@ -275,7 +275,7 @@ fun MessageEventRow(
         Pair(Alignment.CenterStart, Start)
     }
     Box(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .wrapContentHeight(),
         contentAlignment = parentAlignment
@@ -331,7 +331,6 @@ fun MessageEventRow(
                         .zIndex(1f)
                         .offset(x = if (messageEvent.isMine) 0.dp else 20.dp, y = -(16.dp))
                 )
-
             }
             if (messageEvent.isMine) {
                 Spacer(modifier = Modifier.width(16.dp))
@@ -339,9 +338,9 @@ fun MessageEventRow(
         }
     }
     if (messageEvent.groupPosition.isNew()) {
-        Spacer(modifier = Modifier.height(8.dp))
+        Spacer(modifier = modifier.height(8.dp))
     } else {
-        Spacer(modifier = Modifier.height(2.dp))
+        Spacer(modifier = modifier.height(2.dp))
     }
 }
 
diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt b/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt
index ad1b02d7e0..eaac062ae2 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt
@@ -32,7 +32,7 @@ fun MessagesTimelineItemImageView(
         0.7f
     }
     Box(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth(widthPercent)
             .aspectRatio(content.aspectRatio),
         contentAlignment = Alignment.Center,
diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt
index 32857dcd33..5cdee76523 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt
@@ -41,9 +41,9 @@ internal fun RoomSummaryRow(
 ) {
 
     val clickModifier = if (room.isPlaceholder) {
-        Modifier
+        modifier
     } else {
-        Modifier.clickable(
+        modifier.clickable(
             onClick = { onClick(room) },
             indication = rememberRipple(),
             interactionSource = remember { MutableInteractionSource() }