diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef058c340..78544e9c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,7 +76,7 @@ Group changes to describe their impact on the project, as follows:
 ### Changed
 - Added shrink resources to release config in gradle
 
-### Fixed
+### Fixed
 - Remove AuthInfo when configuring a CardDAV friend list if synchronization fails
 - Added missing toast when starting a group call or meeting if there's an issue
 - Fixed crash in RecordingPlayerFragment due to used lateinit property before it's initialized
@@ -357,7 +357,7 @@ Group changes to describe their impact on the project, as follows:
 - Reverted the way of playing incoming call ringone (you may have to configure your own ringtone again), was causing various issues depending on devices/firmwares
 - Show all call history entries if only one account is configured (workaround for missing history for now until a proper fix will be done in SDK)
 
-### Fixed
+### Fixed
 - Issue preventing bluetooth Hearing Aids from working properly (and fixed earpiece/hearing aids icon)
 - Prevent Qr Code scanner to use static picture camera
 - Prevent user from connecting the same account multiple times
diff --git a/app/src/main/res/layout/chat_conversation_send_area.xml b/app/src/main/res/layout/chat_conversation_send_area.xml
index 35c28d99a..cc315ee96 100644
--- a/app/src/main/res/layout/chat_conversation_send_area.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area.xml
@@ -35,6 +35,8 @@
         <include
             android:id="@+id/reply_area"
             layout="@layout/chat_conversation_reply_area"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             bind:viewModel="@{viewModel}"
             android:visibility="@{viewModel.isReplying ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toTopOf="parent" />
@@ -42,6 +44,8 @@
         <include
             android:id="@+id/edit_area"
             layout="@layout/chat_conversation_edit_area"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             bind:viewModel="@{viewModel}"
             android:visibility="@{viewModel.isEditing ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/reply_area" />