diff --git a/vector/src/main/res/layout/item_session_details_content.xml b/vector/src/main/res/layout/item_session_details_content.xml
index a3b2e42c72..fefae65b3d 100644
--- a/vector/src/main/res/layout/item_session_details_content.xml
+++ b/vector/src/main/res/layout/item_session_details_content.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="16dp">
+    android:paddingTop="14dp">
 
     <TextView
         android:id="@+id/sessionDetailsContentTitle"
@@ -12,8 +12,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:ellipsize="end"
-        android:lines="2"
         app:layout_constraintEnd_toStartOf="@id/sessionDetailsContentDescription"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -40,6 +38,13 @@
         android:background="@drawable/divider_horizontal"
         app:layout_constraintEnd_toEndOf="@id/sessionDetailsContentDescription"
         app:layout_constraintStart_toStartOf="@id/sessionDetailsContentTitle"
-        app:layout_constraintTop_toBottomOf="@id/sessionDetailsContentTitle" />
+        app:layout_constraintTop_toBottomOf="@id/sessionDetailsContentBarrier" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/sessionDetailsContentBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="sessionDetailsContentTitle, sessionDetailsContentDescription" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_session_details_header.xml b/vector/src/main/res/layout/item_session_details_header.xml
index 4cead8acff..571a541b2b 100644
--- a/vector/src/main/res/layout/item_session_details_header.xml
+++ b/vector/src/main/res/layout/item_session_details_header.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="16dp">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/sessionDetailsHeaderTitle"