diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
index c6e813e878..8ac8264cad 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -17,8 +17,11 @@ package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewStub
+import android.widget.RelativeLayout
 import androidx.annotation.IdRes
 import androidx.constraintlayout.widget.Guideline
+import androidx.core.view.marginStart
+import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import im.vector.riotx.R
 import im.vector.riotx.core.epoxy.VectorEpoxyHolder
@@ -44,7 +47,9 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
 
     override fun bind(holder: H) {
         super.bind(holder)
-        holder.leftGuideline.setGuidelineBegin(leftGuideline)
+        holder.leftGuideline.updateLayoutParams<RelativeLayout.LayoutParams> {
+            this.marginStart = leftGuideline
+        }
         holder.checkableBackground.isChecked = highlighted
     }
 
@@ -55,7 +60,7 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
     abstract fun getEventIds(): List<String>
 
     abstract class BaseHolder(@IdRes val stubId: Int) : VectorEpoxyHolder() {
-        val leftGuideline by bind<Guideline>(R.id.messageStartGuideline)
+        val leftGuideline by bind<View>(R.id.messageStartGuideline)
         val checkableBackground by bind<CheckableView>(R.id.messageSelectedBackground)
         val readReceiptsView by bind<ReadReceiptsView>(R.id.readReceiptsView)
         val readMarkerView by bind<ReadMarkerView>(R.id.readMarkerView)
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 4eb9be0b9f..ee5d34bd40 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -1,6 +1,5 @@
 <?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"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,139 +8,137 @@
 
     <im.vector.riotx.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?riotx_highlighted_message_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignBottom="@+id/readMarkerView"
+        android:background="?riotx_highlighted_message_background" />
 
     <ImageView
         android:id="@+id/messageAvatarImageView"
         android:layout_width="44dp"
         android:layout_height="44dp"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/messageStartGuideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        tools:layout_constraintGuide_begin="52dp" />
-
     <TextView
         android:id="@+id/messageMemberNameView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
         android:layout_marginRight="8dp"
+        android:layout_toStartOf="@+id/messageTimeView"
+        android:layout_toEndOf="@+id/messageStartGuideline"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
-        app:layout_constraintStart_toEndOf="@id/messageStartGuideline"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/matrix.json/data/displayName" />
 
-
     <TextView
         android:id="@+id/messageTimeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignBaseline="@+id/messageMemberNameView"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
-        app:layout_constraintBaseline_toBaselineOf="@id/messageMemberNameView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/messageMemberNameView"
         tools:text="@tools:sample/date/hhmm" />
 
+    <View
+        android:id="@+id/messageStartGuideline"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        tools:layout_marginStart="52dp"
+        android:orientation="vertical" />
+
+    <FrameLayout
+        android:id="@+id/viewStubContainer"
+        android:addStatesFromChildren="true"
+        android:layout_width="match_parent"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:layout_below="@id/messageMemberNameView"
+        android:layout_height="wrap_content">
 
     <ViewStub
         android:id="@+id/messageContentTextStub"
-        style="@style/TimelineContentStubLayoutParams"
+        android:layout_height="wrap_content"
+        style="@style/TimelineContentStubBaseParams"
         android:inflatedId="@id/messageTextView"
         android:layout="@layout/item_timeline_event_text_message_stub"
-        tools:ignore="MissingConstraints"
         tools:visibility="visible" />
 
     <ViewStub
         android:id="@+id/messageContentMediaStub"
-        style="@style/TimelineContentStubLayoutParams"
+        android:layout_height="wrap_content"
+        style="@style/TimelineContentStubBaseParams"
         android:inflatedId="@+id/messageContentMedia"
-        android:layout="@layout/item_timeline_event_media_message_stub"
-        tools:ignore="MissingConstraints" />
+        android:layout="@layout/item_timeline_event_media_message_stub" />
 
     <ViewStub
         android:id="@+id/messageContentFileStub"
-        style="@style/TimelineContentStubLayoutParams"
-        android:layout="@layout/item_timeline_event_file_stub"
-        tools:ignore="MissingConstraints" />
+        android:layout_height="wrap_content"
+        style="@style/TimelineContentStubBaseParams"
+        android:layout="@layout/item_timeline_event_file_stub" />
 
     <ViewStub
         android:id="@+id/messageContentRedactedStub"
-        style="@style/TimelineContentStubLayoutParams"
+        style="@style/TimelineContentStubBaseParams"
         android:layout_height="20dp"
         android:layout_marginEnd="56dp"
-        android:layout_marginRight="56dp"
-        android:layout="@layout/item_timeline_event_redacted_stub"
-        tools:ignore="MissingConstraints" />
+        android:layout="@layout/item_timeline_event_redacted_stub" />
 
+    </FrameLayout>
 
-    <!-- TODO: For now we show 8 reactions maximum, this will need rework when needed-->
-    <ViewStub
-        android:id="@+id/messageBottomInfo"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:id="@+id/informationBottom"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:inflatedId="@+id/messageBottomInfo"
-        android:layout="@layout/item_timeline_event_bottom_reactions_stub"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/readReceiptsView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/messageStartGuideline"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:visibility="visible">
+        android:layout_below="@+id/viewStubContainer"
+        android:layout_toEndOf="@+id/messageStartGuideline"
+        android:orientation="vertical">
 
-    </ViewStub>
+        <!-- TODO: For now we show 8 reactions maximum, this will need rework when needed-->
 
-    <im.vector.riotx.core.ui.views.ReadReceiptsView
-        android:id="@+id/readReceiptsView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toTopOf="@+id/readMarkerView"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <ViewStub
+            android:id="@+id/messageBottomInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:inflatedId="@+id/messageBottomInfo"
+            android:layout="@layout/item_timeline_event_bottom_reactions_stub"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+        <im.vector.riotx.core.ui.views.ReadReceiptsView
+            android:id="@+id/readReceiptsView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp" />
+
+    </LinearLayout>
 
     <im.vector.riotx.core.ui.views.ReadMarkerView
         android:id="@+id/readMarkerView"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
+        android:layout_below="@+id/informationBottom"
         android:layout_height="2dp"
-        android:background="?attr/vctr_unread_marker_line_color"
-        android:layout_marginBottom="2dp"
-        android:visibility="invisible"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="2dp"
+        android:background="?attr/vctr_unread_marker_line_color"
+        android:visibility="invisible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
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 fc4a527d03..99fb052a96 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
@@ -1,6 +1,5 @@
 <?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"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,70 +8,77 @@
 
     <im.vector.riotx.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignBottom="@+id/informationBottom"
+        android:background="?riotx_highlighted_message_background" />
+
+    <View
+        android:id="@+id/messageStartGuideline"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?riotx_highlighted_message_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginStart="52dp"
+        android:orientation="vertical" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/messageStartGuideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        tools:layout_constraintGuide_begin="52dp" />
+    <FrameLayout
+        android:id="@+id/viewStubContainer"
+        android:layout_width="match_parent"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:layout_alignParentTop="true"
+        android:layout_height="wrap_content">
 
     <ViewStub
         android:id="@+id/messageContentNoticeStub"
-        style="@style/TimelineContentStubNoInfoLayoutParams"
+        style="@style/TimelineContentStubBaseParams"
         android:layout="@layout/item_timeline_event_notice_stub"
-        tools:ignore="MissingConstraints"
         tools:visibility="visible" />
 
     <ViewStub
         android:id="@+id/messageContentDefaultStub"
-        style="@style/TimelineContentStubNoInfoLayoutParams"
+        style="@style/TimelineContentStubBaseParams"
         android:inflatedId="@+id/stateMessageView"
-        android:layout="@layout/item_timeline_event_default_stub"
-        tools:ignore="MissingConstraints" />
+        android:layout="@layout/item_timeline_event_default_stub" />
 
     <ViewStub
         android:id="@+id/messageContentBlankStub"
-        style="@style/TimelineContentStubNoInfoLayoutParams"
+        style="@style/TimelineContentStubBaseParams"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout="@layout/item_timeline_event_blank_stub"
-        tools:ignore="MissingConstraints" />
+        android:layout="@layout/item_timeline_event_blank_stub" />
 
     <ViewStub
         android:id="@+id/messageContentMergedheaderStub"
-        style="@style/TimelineContentStubNoInfoLayoutParams"
-        android:layout="@layout/item_timeline_event_merged_header_stub"
-        tools:ignore="MissingConstraints" />
+        style="@style/TimelineContentStubBaseParams"
+        android:layout="@layout/item_timeline_event_merged_header_stub" />
 
-    <im.vector.riotx.core.ui.views.ReadReceiptsView
-        android:id="@+id/readReceiptsView"
-        android:layout_width="wrap_content"
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/informationBottom"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toTopOf="@+id/readMarkerView"
-        app:layout_constraintEnd_toEndOf="parent" />
+        android:layout_below="@id/viewStubContainer"
+        android:orientation="vertical">
 
-    <im.vector.riotx.core.ui.views.ReadMarkerView
-        android:id="@+id/readMarkerView"
-        android:layout_width="0dp"
-        android:layout_height="2dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="2dp"
-        android:background="?attr/vctr_unread_marker_line_color"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <im.vector.riotx.core.ui.views.ReadReceiptsView
+            android:id="@+id/readReceiptsView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp" />
 
+        <im.vector.riotx.core.ui.views.ReadMarkerView
+            android:id="@+id/readMarkerView"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="2dp"
+            android:background="?attr/vctr_unread_marker_line_color"
+            android:visibility="invisible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index 46c84aa4e7..ede5b0e749 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -1,61 +1,58 @@
 <?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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <include
-        android:id="@+id/itemMergedAvatarListView"
-        layout="@layout/vector_message_merge_avatar_list"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        app:layout_constraintEnd_toStartOf="@+id/itemMergedExpandTextView"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/itemMergedExpandTextView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingRight="8dp"
-        android:layout_marginTop="2dp"
-        android:paddingLeft="8dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
-        android:text="@string/merged_events_expand"
-        android:textColor="?attr/colorAccent"
-        android:textSize="14sp"
-        android:textStyle="italic"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <include
+            android:id="@+id/itemMergedAvatarListView"
+            layout="@layout/vector_message_merge_avatar_list"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_alignParentStart="true"
+            android:layout_toLeftOf="@+id/itemMergedExpandTextView"
+            android:layout_marginEnd="16dp" />
+
+        <TextView
+            android:id="@+id/itemMergedExpandTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:paddingLeft="8dp"
+            android:paddingTop="4dp"
+            android:paddingRight="8dp"
+            android:paddingBottom="4dp"
+            android:layout_alignParentEnd="true"
+            android:text="@string/merged_events_expand"
+            android:textColor="?attr/colorAccent"
+            android:textSize="14sp"
+            android:textStyle="italic" />
+
+    </RelativeLayout>
 
     <View
         android:id="@+id/itemMergedSeparatorView"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="4dp"
-        android:background="?attr/riotx_header_panel_background"
-        app:layout_constraintEnd_toEndOf="@id/itemMergedExpandTextView"
-        app:layout_constraintStart_toStartOf="@id/itemMergedAvatarListView"
-        app:layout_constraintTop_toBottomOf="@id/itemMergedExpandTextView" />
+        android:background="?attr/riotx_header_panel_background"/>
+
 
     <TextView
         android:id="@+id/itemMergedSummaryTextView"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:textColor="?riotx_text_secondary"
         android:textIsSelectable="false"
         android:textSize="14sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/itemMergedAvatarListView"
-        app:layout_constraintTop_toBottomOf="@id/itemMergedSeparatorView"
         tools:text="3 membership changes" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index d1894254cd..1b19c87e08 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -282,7 +282,7 @@
 
 
     <style name="TimelineContentStubBaseParams">
-        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginStart">8dp</item>
         <item name="android:layout_marginLeft">8dp</item>
@@ -290,20 +290,6 @@
         <item name="android:layout_marginRight">8dp</item>
         <item name="android:layout_marginBottom">4dp</item>
         <item name="android:layout_marginTop">4dp</item>
-        <item name="layout_constraintBottom_toBottomOf">parent</item>
-        <item name="layout_constraintEnd_toEndOf">parent</item>
-        <item name="layout_constraintStart_toEndOf">@id/messageStartGuideline</item>
-    </style>
-
-    <style name="TimelineContentStubNoInfoLayoutParams" parent="TimelineContentStubBaseParams">
-        <item name="layout_constraintTop_toTopOf">parent</item>
-        <item name="layout_constraintBottom_toTopOf">@id/readReceiptsView</item>
-    </style>
-
-
-    <style name="TimelineContentStubLayoutParams" parent="TimelineContentStubBaseParams">
-        <item name="layout_constraintTop_toBottomOf">@id/messageMemberNameView</item>
-        <item name="layout_constraintBottom_toTopOf">@id/messageBottomInfo</item>
     </style>
 
     <style name="VectorLabel">