diff --git a/widgetssdk/src/main/res/layout/chat_view.xml b/widgetssdk/src/main/res/layout/chat_view.xml
index a1bc25a5c..78a13cb51 100644
--- a/widgetssdk/src/main/res/layout/chat_view.xml
+++ b/widgetssdk/src/main/res/layout/chat_view.xml
@@ -114,7 +114,7 @@
         android:layout_height="0dp"
         android:layout_width="0dp"
         app:layout_constraintTop_toTopOf="@+id/chat_edit_text"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/chat_edit_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -140,8 +140,8 @@
         android:id="@+id/add_attachment_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@+id/message_input_background"
-        app:layout_constraintBottom_toBottomOf="@+id/message_input_background"
+        app:layout_constraintTop_toTopOf="@+id/chat_edit_text"
+        app:layout_constraintBottom_toBottomOf="@+id/chat_edit_text"
         app:layout_constraintStart_toEndOf="@+id/chat_edit_text"
         app:layout_constraintEnd_toStartOf="@+id/send_button"
         android:background="?attr/selectableItemBackground"
@@ -153,8 +153,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/glia_large"
-        app:layout_constraintBottom_toBottomOf="@+id/message_input_background"
-        app:layout_constraintTop_toTopOf="@+id/message_input_background"
+        app:layout_constraintBottom_toBottomOf="@+id/chat_edit_text"
+        app:layout_constraintTop_toTopOf="@+id/chat_edit_text"
         app:layout_constraintStart_toEndOf="@+id/add_attachment_button"
         app:layout_constraintEnd_toEndOf="parent"
         android:background="?attr/selectableItemBackground"