diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index f7eb7f9c51..68ee0b2dd2 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -164,7 +164,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If it is ok, change the value in file forbidden_strings_in_code.txt
-enum class===72
+enum class===73
 
 ### Do not import temporary legacy classes
 import im.vector.matrix.android.internal.legacy.riot===3
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
index 7a3f77039e..9a79ea6a0a 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
@@ -60,7 +60,6 @@ import im.vector.matrix.android.api.session.room.timeline.getTextEditableContent
 import im.vector.matrix.android.api.util.toOptional
 import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
 import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
-import im.vector.matrix.rx.asObservable
 import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode
 import im.vector.matrix.rx.rx
 import im.vector.matrix.rx.unwrap
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 f8d46bb04e..d509d4e88b 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
@@ -65,7 +65,7 @@
             android:id="@+id/messageContentMergedUTDStub"
             style="@style/TimelineContentStubBaseParams"
             android:layout="@layout/item_timeline_event_merged_utd_stub"
-            tools:layout_marginTop="240dp"
+            tools:layout_marginTop="380dp"
             tools:visibility="visible" />
 
     </FrameLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 039e0b7960..847324884c 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/mergedUTDTile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:orientation="vertical"
-        android:gravity="center_vertical"
         android:layout_gravity="center"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="52dp"
         android:layout_marginBottom="2dp"
         android:background="@drawable/rounded_rect_shape_8"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
         android:padding="8dp">
 
         <TextView
@@ -26,27 +26,27 @@
             android:layout_gravity="center"
             android:layout_marginStart="8dp"
             android:drawableStart="@drawable/ic_clock"
-            android:drawableTint="?riotx_text_secondary"
             android:drawablePadding="2dp"
             android:gravity="start"
+            android:text="@string/notice_crypto_unable_to_decrypt_merged"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
-            android:text="@string/notice_crypto_unable_to_decrypt_merged" />
+            app:drawableTint="?riotx_text_secondary" />
 
 
         <TextView
             android:id="@+id/itemVerificationDoneDetailTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="12dp"
+            android:gravity="center"
+            android:text="@string/notice_crypto_unable_to_decrypt_friendly_desc"
             android:textColor="?riotx_text_secondary"
             android:textSize="12sp"
-            android:textStyle="italic"
-            android:text="@string/notice_crypto_unable_to_decrypt_friendly_desc" />
+            android:textStyle="italic" />
 
 
         <TextView
@@ -59,11 +59,12 @@
             android:paddingTop="4dp"
             android:paddingRight="8dp"
             android:paddingBottom="4dp"
-            android:visibility="gone"
             android:text="@string/merged_events_expand"
             android:textColor="?attr/colorAccent"
             android:textSize="14sp"
-            android:textStyle="italic" />
+            android:textStyle="italic"
+            android:visibility="gone"
+            tools:visibility="visible" />
 
     </LinearLayout>