diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 5e5cda2723..12e5a987fb 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -8,9 +8,7 @@
android:id="@+id/vSeparatorAttachments"
android:layout_width="0dp"
android:layout_height="1dp"
- android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
- android:layout_marginEnd="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_calendar.xml b/app/src/main/res/layout/include_message_calendar.xml
index a3f9f632a3..459616429b 100644
--- a/app/src/main/res/layout/include_message_calendar.xml
+++ b/app/src/main/res/layout/include_message_calendar.xml
@@ -10,9 +10,7 @@
android:id="@+id/vSeparatorCalendar"
android:layout_width="0dp"
android:layout_height="1dp"
- android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
- android:layout_marginEnd="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_headers.xml b/app/src/main/res/layout/include_message_headers.xml
index 788b95c0f1..c203ca4131 100644
--- a/app/src/main/res/layout/include_message_headers.xml
+++ b/app/src/main/res/layout/include_message_headers.xml
@@ -8,9 +8,7 @@
android:id="@+id/vSeparatorHeaders"
android:layout_width="0dp"
android:layout_height="1dp"
- android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
- android:layout_marginEnd="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_images.xml b/app/src/main/res/layout/include_message_images.xml
index 897fbe2a20..8d74ca1e63 100644
--- a/app/src/main/res/layout/include_message_images.xml
+++ b/app/src/main/res/layout/include_message_images.xml
@@ -8,9 +8,7 @@
android:id="@+id/vSeparatorImages"
android:layout_width="0dp"
android:layout_height="1dp"
- android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
- android:layout_marginEnd="6dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
deleted file mode 100644
index f61dd32ca9..0000000000
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-