diff --git a/app/src/main/res/layout-land/voip_conference_active_speaker.xml b/app/src/main/res/layout-land/voip_conference_active_speaker.xml
index fdc7030d7..ea023c7f9 100644
--- a/app/src/main/res/layout-land/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout-land/voip_conference_active_speaker.xml
@@ -54,13 +54,15 @@
         <TextView
             android:id="@+id/remote_name"
             style="@style/call_header_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
             app:layout_constraintTop_toBottomOf="@id/hinge_top" />
 
         <Chronometer
diff --git a/app/src/main/res/layout-land/voip_conference_grid.xml b/app/src/main/res/layout-land/voip_conference_grid.xml
index 95a7e2bf5..b54967a54 100644
--- a/app/src/main/res/layout-land/voip_conference_grid.xml
+++ b/app/src/main/res/layout-land/voip_conference_grid.xml
@@ -61,13 +61,15 @@
         <TextView
             android:id="@+id/remote_name"
             style="@style/call_header_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
             app:layout_constraintTop_toBottomOf="@id/hinge_top" />
 
         <Chronometer
diff --git a/app/src/main/res/layout/chat_message_reply.xml b/app/src/main/res/layout/chat_message_reply.xml
index 490317e5c..8de834475 100644
--- a/app/src/main/res/layout/chat_message_reply.xml
+++ b/app/src/main/res/layout/chat_message_reply.xml
@@ -59,6 +59,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
+                android:maxLines="5"
+                android:ellipsize="end"
                 style="@style/chat_message_reply_font"
                 android:text="@{data.text, default=`Lorem Ipsum`}"/>
 
diff --git a/app/src/main/res/layout/chat_message_reply_bubble.xml b/app/src/main/res/layout/chat_message_reply_bubble.xml
index f1ce24a4b..3c8521d13 100644
--- a/app/src/main/res/layout/chat_message_reply_bubble.xml
+++ b/app/src/main/res/layout/chat_message_reply_bubble.xml
@@ -69,6 +69,8 @@
                 android:layout_height="wrap_content"
                 android:singleLine="false"
                 android:layout_marginTop="5dp"
+                android:maxLines="5"
+                android:ellipsize="end"
                 style="@style/chat_message_reply_font"
                 android:text="@{data.text, default=`Lorem ipsum`}"/>
 
diff --git a/app/src/main/res/layout/chat_room_imdn_fragment.xml b/app/src/main/res/layout/chat_room_imdn_fragment.xml
index 9086e0823..d8bf44461 100644
--- a/app/src/main/res/layout/chat_room_imdn_fragment.xml
+++ b/app/src/main/res/layout/chat_room_imdn_fragment.xml
@@ -9,17 +9,17 @@
             type="org.linphone.activities.main.chat.viewmodels.ImdnViewModel" />
     </data>
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/main_activity_top_bar_size"
             android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/back"
@@ -48,17 +48,24 @@
         </LinearLayout>
 
         <include
+            android:id="@+id/message"
             layout="@layout/chat_message_list_cell"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:data="@{viewModel.chatMessageViewModel}" />
+            app:data="@{viewModel.chatMessageViewModel}"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/top_bar"
+            app:layout_constraintHeight_max="200dp"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/participantsList"
             android:layout_marginTop="5dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="0dp"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recording_list_cell.xml b/app/src/main/res/layout/recording_list_cell.xml
index 87244c101..d0d13a014 100644
--- a/app/src/main/res/layout/recording_list_cell.xml
+++ b/app/src/main/res/layout/recording_list_cell.xml
@@ -83,26 +83,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true">
+                android:layout_alignParentTop="true"
+                android:layout_toLeftOf="@id/playing_info"
+                android:layout_marginEnd="5dp">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@{data.name}" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text=" - " />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{data.formattedDate}" />
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:text="@{data.name + `-` + data.formattedDate, default=`This is a sample meeeting recording - 13:50`}" />
 
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/playing_info"
                 style="@style/standard_text_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -115,17 +110,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@{data.formattedPosition}" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="/" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{data.formattedDuration}" />
+                    android:text="@{data.formattedPosition + `/` + data.formattedDuration, default=`00:00/00:04`}" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/voip_conference_active_speaker.xml b/app/src/main/res/layout/voip_conference_active_speaker.xml
index 659d5689d..8a420195b 100644
--- a/app/src/main/res/layout/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout/voip_conference_active_speaker.xml
@@ -61,13 +61,15 @@
         <TextView
             android:id="@+id/remote_name"
             style="@style/call_header_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
             app:layout_constraintTop_toBottomOf="@id/hinge_top" />
 
         <Chronometer
diff --git a/app/src/main/res/layout/voip_conference_audio_only.xml b/app/src/main/res/layout/voip_conference_audio_only.xml
index 05d8de9e6..91ca75f0c 100644
--- a/app/src/main/res/layout/voip_conference_audio_only.xml
+++ b/app/src/main/res/layout/voip_conference_audio_only.xml
@@ -61,13 +61,15 @@
         <TextView
             android:id="@+id/remote_name"
             style="@style/call_header_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
             app:layout_constraintTop_toBottomOf="@id/hinge_top" />
 
         <Chronometer
diff --git a/app/src/main/res/layout/voip_conference_grid.xml b/app/src/main/res/layout/voip_conference_grid.xml
index 95a7e2bf5..b54967a54 100644
--- a/app/src/main/res/layout/voip_conference_grid.xml
+++ b/app/src/main/res/layout/voip_conference_grid.xml
@@ -61,13 +61,15 @@
         <TextView
             android:id="@+id/remote_name"
             style="@style/call_header_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="@{controlsViewModel.folded ? @dimen/voip_conference_header_folded_top_margin : @dimen/margin_0dp}"
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{conferenceViewModel.subject, default=@string/conference_default_title}"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/toggle_conference_recording"
             app:layout_constraintTop_toBottomOf="@id/hinge_top" />
 
         <Chronometer