diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 0bb45a64..3f2cfd4b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -44,12 +44,11 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AEventItemBase<H>() {
         super.bind(holder)
         if (informationData.showInformation) {
 
-            val lp = holder.avatarImageView.layoutParams?.apply {
+            holder.avatarImageView.layoutParams = holder.avatarImageView.layoutParams?.apply {
                 val size = dpToPx(avatarStyle.avatarSizeDP, holder.view.context)
                 height = size
                 width = size
             }
-            holder.avatarImageView.layoutParams = lp
 
             holder.avatarImageView.visibility = View.VISIBLE
             holder.avatarImageView.setOnClickListener(avatarClickListener)
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index e1f9d757..80a0159e 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -4,6 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:addStatesFromChildren="true"
+    android:background="?attr/selectableItemBackground"
     android:paddingLeft="8dp"
     android:paddingRight="8dp">
 
@@ -18,11 +20,11 @@
         tools:src="@tools:sample/avatars" />
 
     <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/messageStartGuideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/messageStartGuideline"
-        tools:layout_constraintGuide_begin="44dp"
-        android:orientation="vertical"/>
+        android:orientation="vertical"
+        tools:layout_constraintGuide_begin="44dp" />
 
     <TextView
         android:id="@+id/messageMemberNameView"
@@ -30,8 +32,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginEnd="4dp"
         android:layout_marginTop="4dp"
+        android:layout_marginEnd="4dp"
         android:layout_marginRight="8dp"
         android:ellipsize="end"
         android:maxLines="1"
@@ -58,12 +60,12 @@
 
 
     <ViewStub
-        tools:visibility="visible"
         android:id="@+id/messageContentTextStub"
         style="@style/TimelineContentStubLayoutParams"
         android:inflatedId="@id/messageTextView"
         android:layout="@layout/item_timeline_event_text_message_stub"
-        tools:ignore="MissingConstraints"/>
+        tools:ignore="MissingConstraints"
+        tools:visibility="visible" />
 
     <ViewStub
         android:id="@+id/messageContentMediaStub"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index 29f93bd3..9504e205 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:addStatesFromChildren="true"
     android:paddingLeft="8dp"
     android:paddingRight="8dp">