diff --git a/changelog.d/7310.bugfix b/changelog.d/7310.bugfix
new file mode 100644
index 0000000000..3570b2d3ad
--- /dev/null
+++ b/changelog.d/7310.bugfix
@@ -0,0 +1 @@
+[Device Management] Long session names not handled well
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 fefae65b3d..98a21aa923 100644
--- a/vector/src/main/res/layout/item_session_details_content.xml
+++ b/vector/src/main/res/layout/item_session_details_content.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="14dp">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/sessionDetailsContentTitle"
@@ -12,9 +11,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
+        app:layout_constraintBottom_toTopOf="@id/sessionDetailsContentDivider"
         app:layout_constraintEnd_toStartOf="@id/sessionDetailsContentDescription"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/sessionDetailsContentTop"
         tools:text="Session name" />
 
     <TextView
@@ -25,26 +25,34 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:gravity="end"
+        app:layout_constraintBottom_toTopOf="@id/sessionDetailsContentDivider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/sessionDetailsContentTitle"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Element Web: Firefox on macOS" />
+        app:layout_constraintTop_toTopOf="@id/sessionDetailsContentTop"
+        tools:text="Element Web: Firefox" />
 
     <View
         android:id="@+id/sessionDetailsContentDivider"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginTop="14dp"
         android:background="@drawable/divider_horizontal"
         app:layout_constraintEnd_toEndOf="@id/sessionDetailsContentDescription"
         app:layout_constraintStart_toStartOf="@id/sessionDetailsContentTitle"
-        app:layout_constraintTop_toBottomOf="@id/sessionDetailsContentBarrier" />
+        app:layout_constraintTop_toTopOf="@id/sessionDetailsContentBarrier" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/sessionDetailsContentBarrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="bottom"
+        app:barrierMargin="14dp"
         app:constraint_referenced_ids="sessionDetailsContentTitle, sessionDetailsContentDescription" />
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/sessionDetailsContentTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="14dp" />
+
 </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 571a541b2b..64e0efac1f 100644
--- a/vector/src/main/res/layout/item_session_details_header.xml
+++ b/vector/src/main/res/layout/item_session_details_header.xml
@@ -3,7 +3,8 @@
     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:layout_height="wrap_content"
+    android:paddingBottom="10dp">
 
     <TextView
         android:id="@+id/sessionDetailsHeaderTitle"
diff --git a/vector/src/main/res/layout/view_session_info.xml b/vector/src/main/res/layout/view_session_info.xml
index 18daae825a..be51bc6915 100644
--- a/vector/src/main/res/layout/view_session_info.xml
+++ b/vector/src/main/res/layout/view_session_info.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_current_session"
+    android:paddingHorizontal="24dp"
     android:paddingBottom="16dp">
 
     <ImageView
@@ -26,6 +27,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/sessionInfoDeviceTypeImageView"
@@ -64,7 +68,6 @@
         style="@style/TextAppearance.Vector.Body.DevicesManagement"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="12dp"
         android:gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
@@ -77,7 +80,6 @@
         style="@style/TextAppearance.Vector.Body.DevicesManagement"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="12dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
@@ -92,7 +94,6 @@
         style="@style/TextAppearance.Vector.Body.DevicesManagement"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="32dp"
         android:gravity="center"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
@@ -105,7 +106,6 @@
         android:id="@+id/sessionInfoVerifySessionButton"
         android:layout_width="0dp"
         android:layout_height="52dp"
-        android:layout_marginHorizontal="24dp"
         android:layout_marginTop="16dp"
         android:text="@string/device_manager_verify_session"
         app:layout_constraintEnd_toEndOf="parent"
@@ -117,7 +117,6 @@
         style="@style/Widget.Vector.Button.Text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
         android:layout_marginTop="8dp"
         android:text="@string/device_manager_view_details"
         app:layout_constraintEnd_toEndOf="parent"