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 36df11e6e9..16899aa90c 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -243,7 +243,7 @@
         android:id="@+id/messageSendStateImageView"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignBottom="@+id/bubbleWrapper"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
@@ -257,7 +257,7 @@
         android:id="@+id/eventSendingIndicator"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignBottom="@+id/bubbleWrapper"
         android:indeterminateTint="?riotx_text_secondary"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"