diff --git a/app/ui/base/src/main/res/layout/toolbar.xml b/app/ui/base/src/main/res/layout/toolbar.xml
index 963a4813b1b..dd12ddf93d3 100644
--- a/app/ui/base/src/main/res/layout/toolbar.xml
+++ b/app/ui/base/src/main/res/layout/toolbar.xml
@@ -1,4 +1,5 @@
+
(R.id.toolbarTitle).text = title
+ findViewById(R.id.toolbarSubtitle).apply {
+ if (subtitle != null) {
+ text = subtitle
+ isGone = false
+ } else {
+ text = null
+ isGone = true
+ }
+ }
}
override fun setMessageListTitle(title: String, subtitle: String?) {
diff --git a/app/ui/legacy/src/main/res/layout/message_list.xml b/app/ui/legacy/src/main/res/layout/message_list.xml
index 5540d378be7..23f0c982ab0 100644
--- a/app/ui/legacy/src/main/res/layout/message_list.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list.xml
@@ -1,6 +1,7 @@
-
+ android:minHeight="?attr/actionBarSize"
+ android:layout_alignParentTop="true"
+ tools:navigationIcon="@drawable/ic_arrow_back">
+
+
+
+
+
+
+
+
+
+
+