diff --git a/vector/src/main/res/layout/typing_message_layout.xml b/vector/src/main/res/layout/typing_message_layout.xml
index c8b334c628..ceaea8991c 100644
--- a/vector/src/main/res/layout/typing_message_layout.xml
+++ b/vector/src/main/res/layout/typing_message_layout.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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">
 
+    <!-- This is a LinearLayout which will contain avatars of the typing users -->
     <im.vector.app.core.ui.views.TypingMessageAvatar
         android:id="@+id/avatars"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_height="32dp" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/users_name"
@@ -22,7 +25,8 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="@id/avatars"
         app:layout_constraintStart_toEndOf="@id/avatars"
-        app:layout_constraintTop_toTopOf="@id/avatars" />
+        app:layout_constraintTop_toTopOf="@id/avatars"
+        tools:text="@sample/users.json/data/displayName" />
 
     <im.vector.app.core.ui.views.TypingMessageDotsView
         android:id="@+id/viewDots"
@@ -30,9 +34,8 @@
         android:layout_height="0dp"
         android:layout_marginStart="8dp"
         android:gravity="center"
-        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@id/users_name"
         app:layout_constraintStart_toEndOf="@id/users_name"
         app:layout_constraintTop_toTopOf="@id/users_name" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>