diff --git a/app/build.gradle b/app/build.gradle
index 7e3e938ded..e21d2eb27a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -275,7 +275,7 @@ dependencies {
def webkit_version = "1.4.0"
def recyclerview_version = "1.2.1"
def coordinatorlayout_version = "1.1.0"
- def constraintlayout_version = "2.0.4"
+ def constraintlayout_version = "2.1.0"
def material_version = "1.4.0"
def browser_version = "1.3.0"
def lbm_version = "1.0.0"
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index e917263a7a..75deb1491d 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -5,395 +5,397 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@id/workaround" />