diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
index a37f6419a4..83cb42b614 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -445,7 +445,7 @@ class MessagesPresenter @AssistedInject constructor(
         clipboardHelper.copyPlainText(content)
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            snackbarDispatcher.post(SnackbarMessage(R.string.screen_room_message_copied))
+            snackbarDispatcher.post(SnackbarMessage(R.string.screen_room_timeline_message_copied))
         }
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index ba977edd6c..91cccd88e8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -551,7 +551,7 @@ private fun CantSendMessageBanner() {
         horizontalArrangement = Arrangement.Center
     ) {
         Text(
-            text = stringResource(id = R.string.screen_room_no_permission_to_post),
+            text = stringResource(id = R.string.screen_room_timeline_no_permission_to_post),
             color = MaterialTheme.colorScheme.onSecondary,
             style = MaterialTheme.typography.bodyMedium,
             textAlign = TextAlign.Center,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
index 2207c81750..2791ee632c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
@@ -101,14 +101,14 @@ fun ReportMessageView(
             OutlinedTextField(
                 value = state.reason,
                 onValueChange = { state.eventSink(ReportMessageEvents.UpdateReason(it)) },
-                placeholder = { Text(stringResource(R.string.report_content_hint)) },
+                placeholder = { Text(stringResource(R.string.screen_report_content_hint)) },
                 enabled = !isSending,
                 modifier = Modifier
                     .fillMaxWidth()
                     .heightIn(min = 90.dp)
             )
             Text(
-                text = stringResource(R.string.report_content_explanation),
+                text = stringResource(R.string.screen_report_content_explanation),
                 style = ElementTheme.typography.fontBodySmRegular,
                 color = MaterialTheme.colorScheme.secondary,
                 textAlign = TextAlign.Start,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
index a2a691cbcf..74998afb89 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
@@ -113,7 +113,7 @@ private fun TimelineItemGroupedEventsRowContent(
     Column(modifier = modifier.animateContentSize()) {
         GroupHeaderView(
             text = pluralStringResource(
-                id = R.plurals.room_timeline_state_changes,
+                id = R.plurals.screen_room_timeline_state_changes,
                 count = timelineItem.events.size,
                 timelineItem.events.size
             ),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
index 5fd8b20f14..b91699a5ee 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
@@ -90,7 +90,13 @@ private fun TimelineItemReactionsView(
             expandButton = {
                 MessagesReactionButton(
                     content = MessagesReactionsButtonContent.Text(
-                        text = stringResource(id = if (expanded) R.string.screen_room_reactions_show_less else R.string.screen_room_reactions_show_more)
+                        text = stringResource(
+                            id = if (expanded) {
+                                R.string.screen_room_timeline_reactions_show_less
+                            } else {
+                                R.string.screen_room_timeline_reactions_show_more
+                            }
+                        )
                     ),
                     onClick = onToggleExpandClick,
                     onLongClick = {}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt
index 1d50bedfbb..25b32ec1e4 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt
@@ -44,7 +44,7 @@ internal fun TimelineItemReadMarkerView(
         verticalArrangement = spacedBy(4.dp),
     ) {
         Text(
-            text = stringResource(id = R.string.room_timeline_read_marker_title).uppercase(),
+            text = stringResource(id = R.string.screen_room_timeline_read_marker_title).uppercase(),
             style = ElementTheme.typography.fontBodySmMedium,
             color = ElementTheme.colors.textSecondary,
         )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt
index 7601a466c4..d3ded0e603 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt
@@ -45,9 +45,9 @@ fun TimelineItemRoomBeginningView(
         contentAlignment = Alignment.Center,
     ) {
         val text = if (roomName == null) {
-            stringResource(id = R.string.room_timeline_beginning_of_room_no_name)
+            stringResource(id = R.string.screen_room_timeline_beginning_of_room_no_name)
         } else {
-            stringResource(id = R.string.room_timeline_beginning_of_room, roomName)
+            stringResource(id = R.string.screen_room_timeline_beginning_of_room, roomName)
         }
         Text(
             color = MaterialTheme.colorScheme.secondary,