diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsPreviewParam.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsPreviewParam.kt
index 4791c5397e..1b48e0eb9b 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsPreviewParam.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsPreviewParam.kt
@@ -32,6 +32,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageTy
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 
@@ -163,9 +164,10 @@ fun aProfileDetailsReady(
     displayName: String? = USER_NAME_SENDER,
     displayNameAmbiguous: Boolean = false,
     avatarUrl: String? = null,
+    displayedStatus: DisplayedStatus? = null
 ) = ProfileDetails.Ready(
     displayName = displayName,
     displayNameAmbiguous = displayNameAmbiguous,
     avatarUrl = avatarUrl,
-    displayedStatus = null,
+    displayedStatus = displayedStatus,
 )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataPreviewParam.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataPreviewParam.kt
index 3b20643340..cccb176d5c 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataPreviewParam.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataPreviewParam.kt
@@ -13,6 +13,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.api.user.UserStatus
+import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsReady
 
 data class SenderNameData(
     val userId: UserId,
@@ -36,26 +38,44 @@ open class SenderNameDataPreviewParam : PreviewParameterProvider<SenderNameData>
                         senderNameMode = senderNameMode,
                         displayNameAmbiguous = true,
                     ),
-                    SenderNameData(
+                    aSenderNameData(
                         senderNameMode = senderNameMode,
-                        userId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
                         profileDetails = ProfileDetails.Unavailable,
                     ),
+                    aSenderNameData(
+                        senderNameMode = senderNameMode,
+                        displayName = null,
+                    ),
+                    aSenderNameData(
+                        senderNameMode = senderNameMode,
+                        displayedStatus = DisplayedStatus.UserSet(
+                            status = UserStatus(
+                                emoji = "😀",
+                                text = "Should not be rendered",
+                            ),
+                        ),
+                    ),
+                    aSenderNameData(
+                        senderNameMode = senderNameMode,
+                        displayedStatus = DisplayedStatus.InCall(0L),
+                    )
                 )
             }
 }
 
 private fun aSenderNameData(
     senderNameMode: SenderNameMode,
+    userId: UserId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
+    displayName: String? = "Alice ${senderNameMode.javaClass.simpleName}",
     displayNameAmbiguous: Boolean = false,
     displayedStatus: DisplayedStatus? = null,
-) = SenderNameData(
-    userId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
-    profileDetails = ProfileDetails.Ready(
-        displayName = "Alice ${senderNameMode.javaClass.simpleName}",
+    profileDetails: ProfileDetails = aProfileDetailsReady(
+        displayName = displayName,
         displayNameAmbiguous = displayNameAmbiguous,
-        avatarUrl = null,
         displayedStatus = displayedStatus,
-    ),
+    )
+) = SenderNameData(
+    userId = userId,
+    profileDetails = profileDetails,
     senderNameMode = senderNameMode,
 )