diff --git a/library/ui-styles/src/main/res/values/styles_timeline.xml b/library/ui-styles/src/main/res/values/styles_timeline.xml
index 127d9f3dc7..3bd3543de2 100644
--- a/library/ui-styles/src/main/res/values/styles_timeline.xml
+++ b/library/ui-styles/src/main/res/values/styles_timeline.xml
@@ -6,6 +6,13 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <style name="TimelineContentStubContainerParams">
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+    </style>
+
     <style name="TimelineContentMediaPillStyle">
         <item name="android:paddingStart">8dp</item>
         <item name="android:paddingEnd">8dp</item>
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 f400fc6a9a..731642cabd 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
@@ -26,6 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
+        style="@style/TimelineContentStubContainerParams"
         android:layout_toEndOf="@id/messageStartGuideline">
 
         <ViewStub
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index ba546c040f..927abbfd16 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -31,6 +31,7 @@
 
     <FrameLayout
         android:id="@+id/viewStubContainer"
+        style="@style/TimelineContentStubContainerParams"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
diff --git a/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml b/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
index 440a1f4602..1fea380b1f 100644
--- a/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
+++ b/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
@@ -4,12 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:addStatesFromChildren="true"
-    android:paddingStart="8dp"
-    android:paddingLeft="8dp"
-    android:paddingTop="4dp"
-    android:paddingEnd="8dp"
-    android:paddingRight="8dp"
-    android:paddingBottom="4dp">
+    style="@style/TimelineContentStubContainerParams">
 
     <ViewStub
         android:id="@+id/messageContentTextStub"
@@ -18,13 +13,6 @@
         android:layout="@layout/item_timeline_event_text_message_stub"
         tools:visibility="visible" />
 
-    <ViewStub
-        android:id="@+id/messageContentCodeBlockStub"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout="@layout/item_timeline_event_code_block_stub"
-        tools:visibility="visible" />
-
     <ViewStub
         android:id="@+id/messageContentMediaStub"
         style="@style/TimelineContentStubBaseParams"