diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
index 98a9ccaa2d..de9b92884c 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
@@ -40,51 +40,59 @@
     <TextView
         android:id="@+id/titleText"
         style="@style/Widget.Vector.TextView.Body.Medium"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
         android:contentDescription="@string/avatar"
+        android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintEnd_toStartOf="@id/liveIndicator"
         app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/rooms.json/data/name" />
 
-    <androidx.constraintlayout.helper.widget.Flow
-        android:id="@+id/metadataFlow"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/metadataGroup"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:layout_marginEnd="4dp"
         android:orientation="vertical"
-        app:constraint_referenced_ids="broadcasterNameMetadata,bufferingMetadata,voiceBroadcastMetadata,listenersCountMetadata"
-        app:flow_horizontalAlign="start"
-        app:flow_verticalGap="4dp"
+        app:layout_constraintEnd_toStartOf="@id/liveIndicator"
         app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
-        app:layout_constraintTop_toBottomOf="@id/titleText" />
+        app:layout_constraintTop_toBottomOf="@id/titleText">
 
-    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
-        android:id="@+id/broadcasterNameMetadata"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:metadataIcon="@drawable/ic_voice_broadcast_mic"
-        tools:metadataValue="@sample/users.json/data/displayName" />
+        <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+            android:id="@+id/broadcasterNameMetadata"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            app:metadataIcon="@drawable/ic_voice_broadcast_mic"
+            tools:metadataValue="@sample/users.json/data/displayName" />
 
-    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastBufferingView
-        android:id="@+id/bufferingMetadata"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        <im.vector.app.features.voicebroadcast.views.VoiceBroadcastBufferingView
+            android:id="@+id/bufferingMetadata"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp" />
 
-    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
-        android:id="@+id/voiceBroadcastMetadata"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:metadataIcon="@drawable/ic_voice_broadcast"
-        app:metadataValue="@string/attachment_type_voice_broadcast" />
+        <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+            android:id="@+id/voiceBroadcastMetadata"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            app:metadataIcon="@drawable/ic_voice_broadcast"
+            app:metadataValue="@string/attachment_type_voice_broadcast" />
 
-    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
-        android:id="@+id/listenersCountMetadata"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:metadataIcon="@drawable/ic_member_small"
-        app:metadataValue="@string/no_value_placeholder"
-        tools:metadataValue="5 listeners" />
+        <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+            android:id="@+id/listenersCountMetadata"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            app:metadataIcon="@drawable/ic_member_small"
+            app:metadataValue="@string/no_value_placeholder"
+            tools:metadataValue="5 listeners" />
+    </LinearLayout>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/headerBottomBarrier"
@@ -92,7 +100,7 @@
         android:layout_height="wrap_content"
         app:barrierDirection="bottom"
         app:barrierMargin="10dp"
-        app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataFlow" />
+        app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataGroup" />
 
     <androidx.constraintlayout.helper.widget.Flow
         android:id="@+id/controllerButtonsFlow"
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
index ebf4618692..d400386bb3 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
@@ -38,39 +38,45 @@
     <TextView
         android:id="@+id/titleText"
         style="@style/Widget.Vector.TextView.Body.Medium"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
         android:contentDescription="@string/avatar"
+        android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintEnd_toStartOf="@id/liveIndicator"
         app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/users.json/data/displayName" />
+        tools:text="@sample/rooms.json/data/name" />
 
-    <androidx.constraintlayout.helper.widget.Flow
-        android:id="@+id/metadataFlow"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/metadataGroup"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:layout_marginEnd="4dp"
         android:orientation="vertical"
-        app:constraint_referenced_ids="listenersCountMetadata,remainingTimeMetadata"
-        app:flow_horizontalAlign="start"
-        app:flow_verticalGap="4dp"
+        app:layout_constraintEnd_toStartOf="@id/liveIndicator"
         app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
-        app:layout_constraintTop_toBottomOf="@id/titleText" />
+        app:layout_constraintTop_toBottomOf="@id/titleText">
 
-    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
-        android:id="@+id/listenersCountMetadata"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:metadataIcon="@drawable/ic_member_small"
-        app:metadataValue="@string/no_value_placeholder"
-        tools:metadataValue="5 listening" />
+        <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+            android:id="@+id/listenersCountMetadata"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            app:metadataIcon="@drawable/ic_member_small"
+            app:metadataValue="@string/no_value_placeholder"
+            tools:metadataValue="5 listening" />
 
-    <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
-        android:id="@+id/remainingTimeMetadata"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:metadataIcon="@drawable/ic_timer"
-        tools:metadataValue="3h 2m 50s left" />
+        <im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
+            android:id="@+id/remainingTimeMetadata"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            app:metadataIcon="@drawable/ic_timer"
+            tools:metadataValue="3h 2m 50s left" />
+    </LinearLayout>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/headerBottomBarrier"
@@ -78,7 +84,7 @@
         android:layout_height="wrap_content"
         app:barrierDirection="bottom"
         app:barrierMargin="12dp"
-        app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataFlow" />
+        app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataGroup" />
 
     <androidx.constraintlayout.helper.widget.Flow
         android:id="@+id/controllerButtonsFlow"