diff --git a/app/build.gradle b/app/build.gradle
index bb47493a..16ab93c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:ab6a89e3b9'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:4f9c2f94ff'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'com.github.tibbi:android-smsmms:1012d20ab9'
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 34e159f9..95f05312 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -12,8 +12,6 @@ import android.graphics.drawable.LayerDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.provider.Telephony
-import android.view.Menu
-import android.view.MenuItem
 import android.widget.Toast
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
@@ -55,6 +53,7 @@ class MainActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         appLaunched(BuildConfig.APPLICATION_ID)
+        setupOptionsMenu()
 
         if (checkAppSideloading()) {
             return
@@ -88,6 +87,7 @@ class MainActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
+        setupToolbar(main_toolbar)
         if (storedTextColor != getProperTextColor()) {
             (conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(getProperTextColor())
         }
@@ -116,22 +116,18 @@ class MainActivity : SimpleActivity() {
         bus?.unregister(this)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_main, menu)
-        updateMenuItemColors(menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.search -> launchSearch()
-            R.id.settings -> launchSettings()
-            R.id.export_messages -> tryToExportMessages()
-            R.id.import_messages -> tryImportMessages()
-            R.id.about -> launchAbout()
-            else -> return super.onOptionsItemSelected(item)
+    private fun setupOptionsMenu() {
+        main_toolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.search -> launchSearch()
+                R.id.settings -> launchSettings()
+                R.id.export_messages -> tryToExportMessages()
+                R.id.import_messages -> tryImportMessages()
+                R.id.about -> launchAbout()
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
         }
-        return true
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
index acaff574..1268b88f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
@@ -3,16 +3,12 @@ package com.simplemobiletools.smsmessenger.activities
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.view.Menu
 import android.view.WindowManager
 import com.google.gson.Gson
 import com.reddit.indicatorfastscroll.FastScrollItemIndicator
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.MyContactsContentProvider
-import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
-import com.simplemobiletools.commons.helpers.SimpleContactsHelper
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
+import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.commons.models.SimpleContact
 import com.simplemobiletools.smsmessenger.R
@@ -46,15 +42,11 @@ class NewConversationActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
+        setupToolbar(new_conversation_toolbar, NavigationIcon.Arrow)
         no_contacts_placeholder_2.setTextColor(getProperPrimaryColor())
         no_contacts_placeholder_2.underlineText()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        updateMenuItemColors(menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
     private fun initContacts() {
         if (isThirdPartyIntent()) {
             return
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
index 100b1564..862e6ae6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
@@ -37,12 +37,12 @@ class SearchActivity : SimpleActivity() {
         updateTextColors(search_holder)
         search_placeholder.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
         search_placeholder_2.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
+        setupSearch(search_toolbar.menu)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_search, menu)
-        setupSearch(menu)
-        return true
+    override fun onResume() {
+        super.onResume()
+        setupToolbar(search_toolbar, searchMenuItem = mSearchMenuItem)
     }
 
     private fun setupSearch(menu: Menu) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt
index fe85f50b..c45ada9f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt
@@ -4,7 +4,6 @@ import android.annotation.TargetApi
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.view.Menu
 import com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity
 import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
@@ -27,6 +26,7 @@ class SettingsActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
+        setupToolbar(settings_toolbar, NavigationIcon.Arrow)
 
         setupPurchaseThankYou()
         setupCustomizeColors()
@@ -42,7 +42,7 @@ class SettingsActivity : SimpleActivity() {
         setupGroupMessageAsMMS()
         setupLockScreenVisibility()
         setupMMSFileSizeLimit()
-        updateTextColors(settings_scrollview)
+        updateTextColors(settings_nested_scrollview)
 
         if (blockedNumbersAtPause != -1 && blockedNumbersAtPause != getBlockedNumbers().hashCode()) {
             refreshMessages()
@@ -67,11 +67,6 @@ class SettingsActivity : SimpleActivity() {
         blockedNumbersAtPause = getBlockedNumbers().hashCode()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        updateMenuItemColors(menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
     private fun setupPurchaseThankYou() {
         settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled())
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index b4f96cff..5d037145 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -16,7 +16,9 @@ import android.telephony.SmsMessage
 import android.telephony.SubscriptionManager
 import android.text.TextUtils
 import android.util.TypedValue
-import android.view.*
+import android.view.Gravity
+import android.view.View
+import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams
@@ -84,6 +86,8 @@ class ThreadActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_thread)
+        setupOptionsMenu()
+        refreshMenuItems()
 
         val extras = intent.extras
         if (extras == null) {
@@ -95,7 +99,7 @@ class ThreadActivity : SimpleActivity() {
         clearAllMessagesIfNeeded()
         threadId = intent.getLongExtra(THREAD_ID, 0L)
         intent.getStringExtra(THREAD_TITLE)?.let {
-            supportActionBar?.title = it
+            thread_toolbar.title = it
         }
 
         bus = EventBus.getDefault()
@@ -123,6 +127,7 @@ class ThreadActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
+        setupToolbar(thread_toolbar, NavigationIcon.Arrow)
 
         val smsDraft = getSmsDraft(threadId)
         if (smsDraft != null) {
@@ -150,10 +155,9 @@ class ThreadActivity : SimpleActivity() {
         bus?.unregister(this)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_thread, menu)
+    private fun refreshMenuItems() {
         val firstPhoneNumber = participants.firstOrNull()?.phoneNumbers?.firstOrNull()?.value
-        menu.apply {
+        thread_toolbar.menu.apply {
             findItem(R.id.delete).isVisible = threadItems.isNotEmpty()
             findItem(R.id.block_number).isVisible = isNougatPlus()
             findItem(R.id.dial_number).isVisible = participants.size == 1
@@ -164,27 +168,25 @@ class ThreadActivity : SimpleActivity() {
                 it.isDigit()
             }
         }
-
-        updateMenuItemColors(menu)
-        return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (participants.isEmpty()) {
-            return true
-        }
+    private fun setupOptionsMenu() {
+        thread_toolbar.setOnMenuItemClickListener { menuItem ->
+            if (participants.isEmpty()) {
+                return@setOnMenuItemClickListener true
+            }
 
-        when (item.itemId) {
-            R.id.block_number -> blockNumber()
-            R.id.delete -> askConfirmDelete()
-            R.id.add_number_to_contact -> addNumberToContact()
-            R.id.dial_number -> dialNumber()
-            R.id.manage_people -> managePeople()
-            R.id.mark_as_unread -> markAsUnread()
-            android.R.id.home -> onHomePressed()
-            else -> return super.onOptionsItemSelected(item)
+            when (menuItem.itemId) {
+                R.id.block_number -> blockNumber()
+                R.id.delete -> askConfirmDelete()
+                R.id.add_number_to_contact -> addNumberToContact()
+                R.id.dial_number -> dialNumber()
+                R.id.manage_people -> managePeople()
+                R.id.mark_as_unread -> markAsUnread()
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
         }
-        return true
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
@@ -320,9 +322,10 @@ class ThreadActivity : SimpleActivity() {
 
     private fun setupAdapter() {
         threadItems = getThreadItems()
-        invalidateOptionsMenu()
 
         runOnUiThread {
+            refreshMenuItems()
+
             val currAdapter = thread_messages_list.adapter
             if (currAdapter == null) {
                 ThreadAdapter(this, threadItems, thread_messages_list) {
@@ -514,7 +517,7 @@ class ThreadActivity : SimpleActivity() {
     private fun setupThreadTitle() {
         val threadTitle = participants.getThreadTitle()
         if (threadTitle.isNotEmpty()) {
-            supportActionBar?.title = participants.getThreadTitle()
+            thread_toolbar.title = participants.getThreadTitle()
         }
     }
 
@@ -831,7 +834,7 @@ class ThreadActivity : SimpleActivity() {
     }
 
     private fun checkSendMessageAvailability() {
-        if (thread_type_message.text.isNotEmpty() || (attachmentSelections.isNotEmpty() && !attachmentSelections.values.any { it.isPending })) {
+        if (thread_type_message.text!!.isNotEmpty() || (attachmentSelections.isNotEmpty() && !attachmentSelections.values.any { it.isPending })) {
             thread_send_message.isClickable = true
             thread_send_message.alpha = 0.9f
         } else {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt
index 672e09f4..4c524e4d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ExportMessagesDialog.kt
@@ -22,31 +22,30 @@ class ExportMessagesDialog(
 
     init {
         val view = (activity.layoutInflater.inflate(R.layout.dialog_export_messages, null) as ViewGroup).apply {
-            export_messages_folder.text = activity.humanizePath(realPath)
+            export_messages_folder.setText(activity.humanizePath(realPath))
             export_messages_filename.setText("${activity.getString(R.string.messages)}_${activity.getCurrentFormattedDateTime()}")
             export_sms_checkbox.isChecked = config.exportSms
             export_mms_checkbox.isChecked = config.exportMms
 
             if (hidePath) {
-                export_messages_folder_label.beGone()
-                export_messages_folder.beGone()
+                export_messages_folder_hint.beGone()
             } else {
                 export_messages_folder.setOnClickListener {
                     activity.hideKeyboard(export_messages_filename)
                     FilePickerDialog(activity, realPath, false, showFAB = true) {
-                        export_messages_folder.text = activity.humanizePath(it)
+                        export_messages_folder.setText(activity.humanizePath(it))
                         realPath = it
                     }
                 }
             }
         }
 
-        AlertDialog.Builder(activity)
+        activity.getAlertDialogBuilder()
             .setPositiveButton(R.string.ok, null)
             .setNegativeButton(R.string.cancel, null)
-            .create().apply {
-                activity.setupDialogStuff(view, this, R.string.export_messages) {
-                    getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+            .apply {
+                activity.setupDialogStuff(view, this, R.string.export_messages) { alertDialog ->
+                    alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                         val filename = view.export_messages_filename.value
                         when {
                             filename.isEmpty() -> activity.toast(R.string.empty_name)
@@ -66,7 +65,7 @@ class ExportMessagesDialog(
                                 config.exportMms = view.export_mms_checkbox.isChecked
                                 config.lastExportPath = file.absolutePath.getParentPath()
                                 callback(file)
-                                dismiss()
+                                alertDialog.dismiss()
                             }
                             else -> activity.toast(R.string.invalid_name)
                         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt
index 54df49be..3a493dc6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ImportMessagesDialog.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.smsmessenger.dialogs
 
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
+import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@@ -27,12 +28,12 @@ class ImportMessagesDialog(
             import_mms_checkbox.isChecked = config.importMms
         }
 
-        AlertDialog.Builder(activity)
+        activity.getAlertDialogBuilder()
             .setPositiveButton(R.string.ok, null)
             .setNegativeButton(R.string.cancel, null)
-            .create().apply {
-                activity.setupDialogStuff(view, this, R.string.import_messages) {
-                    getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+            .apply {
+                activity.setupDialogStuff(view, this, R.string.import_messages) { alertDialog ->
+                    alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                         if (ignoreClicks) {
                             return@setOnClickListener
                         }
@@ -49,7 +50,7 @@ class ImportMessagesDialog(
                         ensureBackgroundThread {
                             MessagesImporter(activity).importMessages(path) {
                                 handleParseResult(it)
-                                dismiss()
+                                alertDialog.dismiss()
                             }
                         }
                     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt
index 3c2087ed..12da5a57 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/SelectTextDialog.kt
@@ -1,7 +1,7 @@
 package com.simplemobiletools.smsmessenger.dialogs
 
-import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.smsmessenger.R
 import kotlinx.android.synthetic.main.dialog_select_text.view.*
@@ -13,9 +13,9 @@ class SelectTextDialog(val activity: BaseSimpleActivity, val text: String) {
             dialog_select_text_value.text = text
         }
 
-        AlertDialog.Builder(activity)
+        activity.getAlertDialogBuilder()
             .setPositiveButton(R.string.ok) { dialog, which -> { } }
-            .create().apply {
+            .apply {
                 activity.setupDialogStuff(view, this)
             }
     }
diff --git a/app/src/main/res/drawable/item_selected_contact_background.xml b/app/src/main/res/drawable/item_selected_contact_background.xml
index f0d2b728..2ddebb40 100644
--- a/app/src/main/res/drawable/item_selected_contact_background.xml
+++ b/app/src/main/res/drawable/item_selected_contact_background.xml
@@ -2,11 +2,8 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/selected_contact_bg">
         <shape android:shape="rectangle">
-
-            <corners android:radius="@dimen/normal_margin" />
-
+            <corners android:radius="@dimen/material_button_corner_radius" />
             <solid android:color="@color/md_grey_white" />
-
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 484e17ab..f18c078f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,63 +5,94 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/main_holder"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/main_app_bar_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/no_conversations_placeholder"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/main_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/bigger_margin"
-            android:alpha="0.8"
-            android:gravity="center"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
-            android:text="@string/no_conversations_found"
-            android:textSize="@dimen/bigger_text_size"
-            android:textStyle="italic"
-            android:visibility="gone" />
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_main"
+            app:title="@string/app_launcher_name"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/no_conversations_placeholder_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/no_conversations_placeholder"
-            android:layout_centerHorizontal="true"
-            android:background="@drawable/ripple_all_corners"
-            android:gravity="center"
-            android:padding="@dimen/activity_margin"
-            android:text="@string/start_conversation"
-            android:textSize="@dimen/bigger_text_size"
-            android:visibility="gone" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-            android:id="@+id/conversations_fastscroller"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/main_nested_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/main_coordinator_wrapper"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
-            <com.simplemobiletools.commons.views.MyRecyclerView
-                android:id="@+id/conversations_list"
+            <RelativeLayout
+                android:id="@+id/main_holder"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:layoutAnimation="@anim/layout_animation"
-                android:overScrollMode="ifContentScrolls"
-                android:scrollbars="none"
-                app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+                android:layout_height="match_parent">
 
-        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
-    </RelativeLayout>
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/no_conversations_placeholder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/bigger_margin"
+                    android:alpha="0.8"
+                    android:gravity="center"
+                    android:paddingLeft="@dimen/activity_margin"
+                    android:paddingRight="@dimen/activity_margin"
+                    android:text="@string/no_conversations_found"
+                    android:textSize="@dimen/bigger_text_size"
+                    android:textStyle="italic"
+                    android:visibility="gone" />
 
-    <com.simplemobiletools.commons.views.MyFloatingActionButton
-        android:id="@+id/conversations_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/activity_margin"
-        android:src="@drawable/ic_plus_vector" />
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/no_conversations_placeholder_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/no_conversations_placeholder"
+                    android:layout_centerHorizontal="true"
+                    android:background="@drawable/ripple_all_corners"
+                    android:gravity="center"
+                    android:padding="@dimen/activity_margin"
+                    android:text="@string/start_conversation"
+                    android:textSize="@dimen/bigger_text_size"
+                    android:visibility="gone" />
 
+                <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
+                    android:id="@+id/conversations_fastscroller"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.simplemobiletools.commons.views.MyRecyclerView
+                        android:id="@+id/conversations_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:clipToPadding="false"
+                        android:layoutAnimation="@anim/layout_animation"
+                        android:overScrollMode="ifContentScrolls"
+                        android:scrollbars="none"
+                        app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+
+                </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
+            </RelativeLayout>
+
+            <com.simplemobiletools.commons.views.MyFloatingActionButton
+                android:id="@+id/conversations_fab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:layout_margin="@dimen/activity_margin"
+                android:src="@drawable/ic_plus_vector" />
+
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_new_conversation.xml b/app/src/main/res/layout/activity_new_conversation.xml
index 842bf8b2..170375c3 100644
--- a/app/src/main/res/layout/activity_new_conversation.xml
+++ b/app/src/main/res/layout/activity_new_conversation.xml
@@ -1,127 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/new_conversation_holder"
+    android:id="@+id/new_conversation_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplemobiletools.commons.views.MyEditText
-        android:id="@+id/new_conversation_address"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/new_conversation_app_bar_layout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:layout_toStartOf="@+id/new_conversation_confirm"
-        android:background="@android:color/transparent"
-        android:gravity="center_vertical"
-        android:hint="@string/add_contact_or_number"
-        android:inputType="textCapWords"
-        android:textSize="@dimen/big_text_size" />
+        android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/new_conversation_confirm"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_alignTop="@+id/new_conversation_address"
-        android:layout_alignBottom="@+id/new_conversation_address"
-        android:layout_alignParentEnd="true"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_check_vector"
-        android:visibility="gone" />
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/new_conversation_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:title="@string/new_conversation"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
 
-    <View
-        android:id="@+id/message_divider_two"
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:layout_below="@+id/new_conversation_address"
-        android:background="@color/divider_grey"
-        android:importantForAccessibility="no" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/no_contacts_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/suggestions_scrollview"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/bigger_margin"
-        android:alpha="0.8"
-        android:gravity="center"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:text="@string/no_access_to_contacts"
-        android:textSize="@dimen/bigger_text_size"
-        android:textStyle="italic"
-        android:visibility="gone" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/no_contacts_placeholder_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/no_contacts_placeholder"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/ripple_all_corners"
-        android:gravity="center"
-        android:padding="@dimen/activity_margin"
-        android:text="@string/request_the_required_permissions"
-        android:textSize="@dimen/bigger_text_size"
-        android:visibility="gone" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/suggestions_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/message_divider_two"
-        android:alpha="0.8"
-        android:padding="@dimen/activity_margin"
-        android:text="@string/suggestions"
-        android:textSize="@dimen/normal_text_size" />
-
-    <HorizontalScrollView
-        android:id="@+id/suggestions_scrollview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/suggestions_label"
-        android:layout_marginBottom="@dimen/medium_margin"
-        android:overScrollMode="never"
-        android:scrollbars="none">
-
-        <LinearLayout
-            android:id="@+id/suggestions_holder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:divider="@drawable/linear_layout_horizontal_divider"
-            android:orientation="horizontal"
-            android:showDividers="middle" />
-    </HorizontalScrollView>
-
-    <com.simplemobiletools.commons.views.MyRecyclerView
-        android:id="@+id/contacts_list"
+    <RelativeLayout
+        android:id="@+id/new_conversation_nested_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/suggestions_scrollview"
-        android:clipToPadding="false"
-        android:layoutAnimation="@anim/layout_animation"
-        android:overScrollMode="ifContentScrolls"
-        android:scrollbars="none"
-        app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <com.reddit.indicatorfastscroll.FastScrollerView
-        android:id="@+id/contacts_letter_fastscroller"
-        android:layout_width="32dp"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/contacts_list"
-        android:layout_alignParentEnd="true"
-        android:paddingTop="@dimen/big_margin"
-        android:paddingBottom="@dimen/big_margin" />
+        <RelativeLayout
+            android:id="@+id/new_conversation_holder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-    <com.reddit.indicatorfastscroll.FastScrollerThumbView
-        android:id="@+id/contacts_letter_fastscroller_thumb"
-        android:layout_width="@dimen/fab_size"
-        android:layout_height="match_parent"
-        android:layout_alignTop="@+id/contacts_letter_fastscroller"
-        android:layout_alignBottom="@+id/contacts_letter_fastscroller"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:layout_toStartOf="@+id/contacts_letter_fastscroller" />
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/new_conversation_address"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_marginStart="@dimen/activity_margin"
+                android:layout_marginEnd="@dimen/activity_margin"
+                android:layout_toStartOf="@+id/new_conversation_confirm"
+                android:background="@android:color/transparent"
+                android:gravity="center_vertical"
+                android:hint="@string/add_contact_or_number"
+                android:inputType="textCapWords"
+                android:textSize="@dimen/big_text_size" />
 
-</RelativeLayout>
+            <ImageView
+                android:id="@+id/new_conversation_confirm"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_alignTop="@+id/new_conversation_address"
+                android:layout_alignBottom="@+id/new_conversation_address"
+                android:layout_alignParentEnd="true"
+                android:background="?selectableItemBackgroundBorderless"
+                android:padding="@dimen/medium_margin"
+                android:src="@drawable/ic_check_vector"
+                android:visibility="gone" />
+
+            <View
+                android:id="@+id/message_divider_two"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_below="@+id/new_conversation_address"
+                android:background="@color/divider_grey"
+                android:importantForAccessibility="no" />
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/no_contacts_placeholder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/suggestions_scrollview"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/bigger_margin"
+                android:alpha="0.8"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_margin"
+                android:paddingRight="@dimen/activity_margin"
+                android:text="@string/no_access_to_contacts"
+                android:textSize="@dimen/bigger_text_size"
+                android:textStyle="italic"
+                android:visibility="gone" />
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/no_contacts_placeholder_2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/no_contacts_placeholder"
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/ripple_all_corners"
+                android:gravity="center"
+                android:padding="@dimen/activity_margin"
+                android:text="@string/request_the_required_permissions"
+                android:textSize="@dimen/bigger_text_size"
+                android:visibility="gone" />
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/suggestions_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/message_divider_two"
+                android:alpha="0.8"
+                android:padding="@dimen/activity_margin"
+                android:text="@string/suggestions"
+                android:textSize="@dimen/normal_text_size" />
+
+            <HorizontalScrollView
+                android:id="@+id/suggestions_scrollview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/suggestions_label"
+                android:layout_marginBottom="@dimen/medium_margin"
+                android:overScrollMode="never"
+                android:scrollbars="none">
+
+                <LinearLayout
+                    android:id="@+id/suggestions_holder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:divider="@drawable/linear_layout_horizontal_divider"
+                    android:orientation="horizontal"
+                    android:showDividers="middle" />
+            </HorizontalScrollView>
+
+            <com.simplemobiletools.commons.views.MyRecyclerView
+                android:id="@+id/contacts_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/suggestions_scrollview"
+                android:clipToPadding="false"
+                android:layoutAnimation="@anim/layout_animation"
+                android:overScrollMode="ifContentScrolls"
+                android:scrollbars="none"
+                app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+
+            <com.reddit.indicatorfastscroll.FastScrollerView
+                android:id="@+id/contacts_letter_fastscroller"
+                android:layout_width="32dp"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/contacts_list"
+                android:layout_alignParentEnd="true"
+                android:paddingTop="@dimen/big_margin"
+                android:paddingBottom="@dimen/big_margin" />
+
+            <com.reddit.indicatorfastscroll.FastScrollerThumbView
+                android:id="@+id/contacts_letter_fastscroller_thumb"
+                android:layout_width="@dimen/fab_size"
+                android:layout_height="match_parent"
+                android:layout_alignTop="@+id/contacts_letter_fastscroller"
+                android:layout_alignBottom="@+id/contacts_letter_fastscroller"
+                android:layout_marginEnd="@dimen/activity_margin"
+                android:layout_toStartOf="@+id/contacts_letter_fastscroller" />
+
+        </RelativeLayout>
+    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index a8e2fe2d..78af7f2e 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -1,46 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/search_holder"
+    android:id="@+id/search_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/search_placeholder"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/search_bar_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/activity_margin"
-        android:alpha="0.8"
-        android:gravity="center"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:text="@string/no_items_found"
-        android:textSize="@dimen/bigger_text_size"
-        android:textStyle="italic" />
+        android:layout_height="wrap_content">
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/search_placeholder_2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/search_placeholder"
-        android:layout_centerHorizontal="true"
-        android:alpha="0.8"
-        android:gravity="center"
-        android:paddingStart="@dimen/activity_margin"
-        android:paddingTop="@dimen/medium_margin"
-        android:paddingEnd="@dimen/activity_margin"
-        android:paddingBottom="@dimen/medium_margin"
-        android:text="@string/type_2_characters"
-        android:textSize="@dimen/bigger_text_size"
-        android:textStyle="italic" />
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/search_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_search"
+            app:title=""
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
 
-    <com.simplemobiletools.commons.views.MyRecyclerView
-        android:id="@+id/search_results_list"
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/search_nested_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:scrollbars="vertical"
-        app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+        android:fillViewport="true"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-</RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/search_holder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/search_placeholder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/activity_margin"
+                android:alpha="0.8"
+                android:gravity="center"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:text="@string/no_items_found"
+                android:textSize="@dimen/bigger_text_size"
+                android:textStyle="italic" />
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/search_placeholder_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/search_placeholder"
+                android:layout_centerHorizontal="true"
+                android:alpha="0.8"
+                android:gravity="center"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:text="@string/type_2_characters"
+                android:textSize="@dimen/bigger_text_size"
+                android:textStyle="italic" />
+
+            <com.simplemobiletools.commons.views.MyRecyclerView
+                android:id="@+id/search_results_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:scrollbars="vertical"
+                app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+
+        </RelativeLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index b7147f6b..72c41af8 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,325 +1,350 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/settings_scrollview"
+    android:id="@+id/settings_coordinator"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/settings_holder"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/settings_app_bar_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/settings_color_customization_label"
-            style="@style/SettingsSectionLabelStyle"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/settings_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/color_customization" />
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:title="@string/settings"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/settings_nested_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
-            android:id="@+id/settings_color_customization_holder"
+            android:id="@+id/settings_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/medium_margin"
-            android:background="@drawable/section_holder_stroke"
             android:orientation="vertical">
 
-            <RelativeLayout
-                android:id="@+id/settings_customize_colors_holder"
-                style="@style/SettingsHolderTextViewOneLinerStyle"
+            <TextView
+                android:id="@+id/settings_color_customization_label"
+                style="@style/SettingsSectionLabelStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/ripple_all_corners">
+                android:text="@string/color_customization" />
 
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_customize_colors_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/settings_color_customization_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/medium_margin"
+                android:background="@drawable/section_holder_stroke"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:id="@+id/settings_customize_colors_holder"
+                    style="@style/SettingsHolderTextViewOneLinerStyle"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/customize_colors" />
+                    android:background="@drawable/ripple_all_corners">
 
-            </RelativeLayout>
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_customize_colors_label"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/customize_colors" />
+
+                </RelativeLayout>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/settings_general_settings_label"
+                style="@style/SettingsSectionLabelStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/general_settings" />
+
+            <LinearLayout
+                android:id="@+id/settings_general_settings_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/medium_margin"
+                android:background="@drawable/section_holder_stroke"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:id="@+id/settings_purchase_thank_you_holder"
+                    style="@style/SettingsHolderTextViewOneLinerStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_top_corners">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_purchase_thank_you"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/purchase_simple_thank_you" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_use_english_holder"
+                    style="@style/SettingsHolderCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                        android:id="@+id/settings_use_english"
+                        style="@style/SettingsCheckboxStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/use_english_language" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_change_date_time_format_holder"
+                    style="@style/SettingsHolderTextViewOneLinerStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_change_date_time_format"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/change_date_and_time_format" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_manage_blocked_numbers_holder"
+                    style="@style/SettingsHolderTextViewOneLinerStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_manage_blocked_numbers"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/manage_blocked_numbers" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_font_size_holder"
+                    style="@style/SettingsHolderTextViewStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_bottom_corners">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_font_size_label"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/font_size" />
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_font_size"
+                        style="@style/SettingsTextValueStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/settings_font_size_label" />
+
+                </RelativeLayout>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/settings_notifications_label"
+                style="@style/SettingsSectionLabelStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/notifications" />
+
+            <LinearLayout
+                android:id="@+id/settings_notifications_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/medium_margin"
+                android:background="@drawable/section_holder_stroke"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:id="@+id/settings_customize_notifications_holder"
+                    style="@style/SettingsHolderTextViewOneLinerStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_top_corners">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_customize_notifications_label"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/customize_notifications" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_lock_screen_visibility_holder"
+                    style="@style/SettingsHolderTextViewStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_bottom_corners">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_lock_screen_visibility_label"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/lock_screen_visibility" />
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_lock_screen_visibility"
+                        style="@style/SettingsTextValueStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/settings_lock_screen_visibility_label"
+                        tools:text="@string/sender_and_message" />
+
+                </RelativeLayout>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/settings_outgoing_messages_label"
+                style="@style/SettingsSectionLabelStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/outgoing_messages" />
+
+            <LinearLayout
+                android:id="@+id/settings_outgoing_messages_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/medium_margin"
+                android:background="@drawable/section_holder_stroke"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:id="@+id/settings_show_character_counter_holder"
+                    style="@style/SettingsHolderCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_top_corners">
+
+                    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                        android:id="@+id/settings_show_character_counter"
+                        style="@style/SettingsCheckboxStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/show_character_counter" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_use_simple_characters_holder"
+                    style="@style/SettingsHolderCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                        android:id="@+id/settings_use_simple_characters"
+                        style="@style/SettingsCheckboxStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/use_simple_characters" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_enable_delivery_reports_holder"
+                    style="@style/SettingsHolderCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                        android:id="@+id/settings_enable_delivery_reports"
+                        style="@style/SettingsCheckboxStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/enable_delivery_reports" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_send_long_message_mms_holder"
+                    style="@style/SettingsHolderCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                        android:id="@+id/settings_send_long_message_mms"
+                        style="@style/SettingsCheckboxStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/send_long_message_mms" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_send_group_message_mms_holder"
+                    style="@style/SettingsHolderCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                        android:id="@+id/settings_send_group_message_mms"
+                        style="@style/SettingsCheckboxStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/group_message_mms" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/settings_mms_file_size_limit_holder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_bottom_corners"
+                    android:padding="@dimen/activity_margin">
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_mms_file_size_limit_label"
+                        style="@style/SettingsTextLabelStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/mms_file_size_limit" />
+
+                    <com.simplemobiletools.commons.views.MyTextView
+                        android:id="@+id/settings_mms_file_size_limit"
+                        style="@style/SettingsTextValueStyle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/settings_mms_file_size_limit_label"
+                        tools:text="@string/mms_file_size_limit_none" />
+
+                </RelativeLayout>
+            </LinearLayout>
         </LinearLayout>
-
-        <TextView
-            android:id="@+id/settings_general_settings_label"
-            style="@style/SettingsSectionLabelStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/general_settings" />
-
-        <LinearLayout
-            android:id="@+id/settings_general_settings_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/medium_margin"
-            android:background="@drawable/section_holder_stroke"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/settings_purchase_thank_you_holder"
-                style="@style/SettingsHolderTextViewOneLinerStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_top_corners">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_purchase_thank_you"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/purchase_simple_thank_you" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_use_english_holder"
-                style="@style/SettingsHolderCheckboxStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_background">
-
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_use_english"
-                    style="@style/SettingsCheckboxStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/use_english_language" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_change_date_time_format_holder"
-                style="@style/SettingsHolderTextViewOneLinerStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_background">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_change_date_time_format"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/change_date_and_time_format" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_manage_blocked_numbers_holder"
-                style="@style/SettingsHolderTextViewOneLinerStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_background">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_manage_blocked_numbers"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/manage_blocked_numbers" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_font_size_holder"
-                style="@style/SettingsHolderTextViewStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_bottom_corners">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_font_size_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/font_size" />
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_font_size"
-                    style="@style/SettingsTextValueStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_font_size_label" />
-
-            </RelativeLayout>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/settings_notifications_label"
-            style="@style/SettingsSectionLabelStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/notifications" />
-
-        <LinearLayout
-            android:id="@+id/settings_notifications_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/medium_margin"
-            android:background="@drawable/section_holder_stroke"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/settings_customize_notifications_holder"
-                style="@style/SettingsHolderTextViewOneLinerStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_top_corners">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_customize_notifications_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/customize_notifications" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_lock_screen_visibility_holder"
-                style="@style/SettingsHolderTextViewStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_bottom_corners">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_lock_screen_visibility_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/lock_screen_visibility" />
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_lock_screen_visibility"
-                    style="@style/SettingsTextValueStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_lock_screen_visibility_label"
-                    tools:text="@string/sender_and_message" />
-
-            </RelativeLayout>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/settings_outgoing_messages_label"
-            style="@style/SettingsSectionLabelStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/outgoing_messages" />
-
-        <LinearLayout
-            android:id="@+id/settings_outgoing_messages_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/medium_margin"
-            android:background="@drawable/section_holder_stroke"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/settings_show_character_counter_holder"
-                style="@style/SettingsHolderCheckboxStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_top_corners">
-
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_show_character_counter"
-                    style="@style/SettingsCheckboxStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/show_character_counter" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_use_simple_characters_holder"
-                style="@style/SettingsHolderCheckboxStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_background">
-
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_use_simple_characters"
-                    style="@style/SettingsCheckboxStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/use_simple_characters" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_enable_delivery_reports_holder"
-                style="@style/SettingsHolderCheckboxStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_background">
-
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_enable_delivery_reports"
-                    style="@style/SettingsCheckboxStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/enable_delivery_reports" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_send_long_message_mms_holder"
-                style="@style/SettingsHolderCheckboxStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_background">
-
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_send_long_message_mms"
-                    style="@style/SettingsCheckboxStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/send_long_message_mms" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_send_group_message_mms_holder"
-                style="@style/SettingsHolderCheckboxStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_background">
-
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_send_group_message_mms"
-                    style="@style/SettingsCheckboxStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/group_message_mms" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_mms_file_size_limit_holder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ripple_bottom_corners"
-                android:padding="@dimen/activity_margin">
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_mms_file_size_limit_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/mms_file_size_limit" />
-
-                <com.simplemobiletools.commons.views.MyTextView
-                    android:id="@+id/settings_mms_file_size_limit"
-                    style="@style/SettingsTextValueStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_mms_file_size_limit_label"
-                    tools:text="@string/mms_file_size_limit_none" />
-
-            </RelativeLayout>
-        </LinearLayout>
-    </LinearLayout>
-</ScrollView>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index 1815c4f0..316e5298 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -1,223 +1,246 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/thread_holder"
+    android:id="@+id/thread_coordinator"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/tiny_margin">
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/thread_app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/thread_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_thread"
+            app:title=""
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <RelativeLayout
-        android:id="@+id/thread_add_contacts"
+        android:id="@+id/thread_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:layout_marginBottom="@dimen/tiny_margin"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <LinearLayout
-            android:id="@+id/selected_contacts"
+        <RelativeLayout
+            android:id="@+id/thread_add_contacts"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/activity_margin"
-            android:orientation="vertical" />
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <LinearLayout
+                android:id="@+id/selected_contacts"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/activity_margin"
+                android:orientation="vertical" />
+
+            <ImageView
+                android:id="@+id/confirm_manage_contacts"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_alignParentEnd="true"
+                android:layout_marginStart="@dimen/medium_margin"
+                android:layout_marginTop="@dimen/normal_margin"
+                android:layout_marginEnd="@dimen/medium_margin"
+                android:background="?selectableItemBackgroundBorderless"
+                android:padding="@dimen/small_margin"
+                android:src="@drawable/ic_check_vector" />
+
+            <View
+                android:id="@+id/message_divider_one"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_below="@+id/selected_contacts"
+                android:background="@color/divider_grey"
+                android:importantForAccessibility="no" />
+
+            <com.simplemobiletools.commons.views.MyAutoCompleteTextView
+                android:id="@+id/add_contact_or_number"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_below="@+id/message_divider_one"
+                android:layout_marginStart="@dimen/activity_margin"
+                android:layout_marginEnd="@dimen/activity_margin"
+                android:layout_toStartOf="@+id/confirm_inserted_number"
+                android:background="@android:color/transparent"
+                android:completionThreshold="2"
+                android:gravity="center_vertical"
+                android:hint="@string/add_contact_or_number"
+                android:inputType="textCapWords"
+                android:textSize="@dimen/big_text_size" />
+
+            <ImageView
+                android:id="@+id/confirm_inserted_number"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignTop="@+id/add_contact_or_number"
+                android:layout_alignBottom="@+id/add_contact_or_number"
+                android:layout_alignParentEnd="true"
+                android:layout_marginStart="@dimen/medium_margin"
+                android:layout_marginEnd="@dimen/medium_margin"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/confirm_selection"
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingEnd="@dimen/medium_margin"
+                android:src="@drawable/ic_check_vector"
+                android:visibility="gone" />
+
+            <View
+                android:id="@+id/message_divider_two"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_below="@+id/add_contact_or_number"
+                android:background="@color/divider_grey"
+                android:importantForAccessibility="no" />
+        </RelativeLayout>
+
+        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
+            android:id="@+id/thread_messages_fastscroller"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/message_divider"
+            android:layout_below="@+id/thread_add_contacts"
+            app:supportSwipeToRefresh="true">
+
+            <com.simplemobiletools.commons.views.MyRecyclerView
+                android:id="@+id/thread_messages_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:overScrollMode="ifContentScrolls"
+                android:scrollbars="none"
+                app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"
+                app:stackFromEnd="true" />
+
+        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
+
+        <View
+            android:id="@+id/message_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_above="@+id/thread_attachments_holder"
+            android:background="@color/divider_grey"
+            android:importantForAccessibility="no" />
 
         <ImageView
-            android:id="@+id/confirm_manage_contacts"
+            android:id="@+id/thread_add_attachment"
+            android:layout_width="@dimen/normal_icon_size"
+            android:layout_height="@dimen/normal_icon_size"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="@dimen/small_margin"
+            android:layout_marginEnd="@dimen/small_margin"
+            android:alpha="0.9"
+            android:background="?selectableItemBackgroundBorderless"
+            android:contentDescription="@string/attachment"
+            android:padding="@dimen/normal_margin"
+            android:src="@drawable/ic_plus_vector" />
+
+        <HorizontalScrollView
+            android:id="@+id/thread_attachments_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/thread_type_message"
+            android:layout_alignStart="@+id/thread_type_message"
+            android:layout_marginTop="@dimen/normal_margin"
+            android:layout_marginBottom="@dimen/small_margin"
+            android:overScrollMode="never"
+            android:scrollbars="none"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:id="@+id/thread_attachments_wrapper"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/attachment_preview_size"
+                android:divider="@drawable/linear_layout_horizontal_divider"
+                android:orientation="horizontal"
+                android:paddingEnd="@dimen/normal_margin"
+                android:showDividers="middle" />
+        </HorizontalScrollView>
+
+        <com.simplemobiletools.commons.views.MyEditText
+            android:id="@+id/thread_type_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginEnd="@dimen/small_margin"
+            android:layout_toStartOf="@+id/thread_select_sim_icon"
+            android:layout_toEndOf="@+id/thread_add_attachment"
+            android:background="@android:color/transparent"
+            android:gravity="center_vertical"
+            android:hint="@string/type_a_message"
+            android:inputType="textCapSentences|textMultiLine"
+            android:minHeight="@dimen/normal_icon_size" />
+
+        <ImageView
+            android:id="@+id/thread_select_sim_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="@dimen/small_margin"
+            android:layout_toStartOf="@+id/thread_character_counter"
+            android:alpha="0.9"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:paddingStart="@dimen/medium_margin"
+            android:paddingTop="@dimen/normal_margin"
+            android:paddingEnd="@dimen/medium_margin"
+            android:paddingBottom="@dimen/normal_margin"
+            android:src="@drawable/ic_sim_vector"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/thread_select_sim_number"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignStart="@+id/thread_select_sim_icon"
+            android:layout_alignTop="@+id/thread_select_sim_icon"
+            android:layout_alignEnd="@+id/thread_select_sim_icon"
+            android:layout_alignBottom="@+id/thread_select_sim_icon"
+            android:gravity="center"
+            android:textSize="@dimen/normal_text_size"
+            android:visibility="gone"
+            tools:text="1" />
+
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/thread_character_counter"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignTop="@+id/thread_send_message"
+            android:layout_alignBottom="@+id/thread_send_message"
+            android:layout_toStartOf="@+id/thread_send_message"
+            android:gravity="center"
+            android:paddingStart="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
+            android:text="0"
+            android:textSize="@dimen/normal_text_size"
+            android:visibility="gone"
+            tools:ignore="HardcodedText" />
+
+        <Button
+            android:id="@+id/thread_send_message"
             android:layout_width="@dimen/normal_icon_size"
             android:layout_height="@dimen/normal_icon_size"
             android:layout_alignParentEnd="true"
-            android:layout_marginStart="@dimen/medium_margin"
-            android:layout_marginTop="@dimen/normal_margin"
-            android:layout_marginEnd="@dimen/medium_margin"
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="@dimen/small_margin"
+            android:layout_marginEnd="@dimen/small_margin"
+            android:alpha="0.4"
             android:background="?selectableItemBackgroundBorderless"
-            android:padding="@dimen/small_margin"
-            android:src="@drawable/ic_check_vector" />
+            android:clickable="false"
+            android:contentDescription="@string/ok"
+            android:drawableTop="@drawable/ic_send_vector"
+            android:paddingVertical="@dimen/small_margin"
+            android:text="@string/sms"
+            android:textSize="@dimen/smaller_text_size" />
 
-        <View
-            android:id="@+id/message_divider_one"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_below="@+id/selected_contacts"
-            android:background="@color/divider_grey"
-            android:importantForAccessibility="no" />
-
-        <com.simplemobiletools.commons.views.MyAutoCompleteTextView
-            android:id="@+id/add_contact_or_number"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/normal_icon_size"
-            android:layout_below="@+id/message_divider_one"
-            android:layout_marginStart="@dimen/activity_margin"
-            android:layout_marginEnd="@dimen/activity_margin"
-            android:layout_toStartOf="@+id/confirm_inserted_number"
-            android:background="@android:color/transparent"
-            android:completionThreshold="2"
-            android:gravity="center_vertical"
-            android:hint="@string/add_contact_or_number"
-            android:inputType="textCapWords"
-            android:textSize="@dimen/big_text_size" />
-
-        <ImageView
-            android:id="@+id/confirm_inserted_number"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignTop="@+id/add_contact_or_number"
-            android:layout_alignBottom="@+id/add_contact_or_number"
-            android:layout_alignParentEnd="true"
-            android:layout_marginStart="@dimen/medium_margin"
-            android:layout_marginEnd="@dimen/medium_margin"
-            android:background="?selectableItemBackgroundBorderless"
-            android:contentDescription="@string/confirm_selection"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingEnd="@dimen/medium_margin"
-            android:src="@drawable/ic_check_vector"
-            android:visibility="gone" />
-
-        <View
-            android:id="@+id/message_divider_two"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_below="@+id/add_contact_or_number"
-            android:background="@color/divider_grey"
-            android:importantForAccessibility="no" />
     </RelativeLayout>
-
-    <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-        android:id="@+id/thread_messages_fastscroller"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/message_divider"
-        android:layout_below="@+id/thread_add_contacts"
-        app:supportSwipeToRefresh="true">
-
-        <com.simplemobiletools.commons.views.MyRecyclerView
-            android:id="@+id/thread_messages_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:overScrollMode="ifContentScrolls"
-            android:scrollbars="none"
-            app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"
-            app:stackFromEnd="true" />
-
-    </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
-
-    <View
-        android:id="@+id/message_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:layout_above="@+id/thread_attachments_holder"
-        android:background="@color/divider_grey"
-        android:importantForAccessibility="no" />
-
-    <ImageView
-        android:id="@+id/thread_add_attachment"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="@dimen/small_margin"
-        android:layout_marginEnd="@dimen/small_margin"
-        android:alpha="0.9"
-        android:background="?selectableItemBackgroundBorderless"
-        android:contentDescription="@string/attachment"
-        android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_plus_vector" />
-
-    <HorizontalScrollView
-        android:id="@+id/thread_attachments_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/thread_type_message"
-        android:layout_alignStart="@+id/thread_type_message"
-        android:layout_marginTop="@dimen/normal_margin"
-        android:layout_marginBottom="@dimen/small_margin"
-        android:overScrollMode="never"
-        android:scrollbars="none"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:id="@+id/thread_attachments_wrapper"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/attachment_preview_size"
-            android:divider="@drawable/linear_layout_horizontal_divider"
-            android:orientation="horizontal"
-            android:paddingEnd="@dimen/normal_margin"
-            android:showDividers="middle" />
-    </HorizontalScrollView>
-
-    <com.simplemobiletools.commons.views.MyEditText
-        android:id="@+id/thread_type_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/small_margin"
-        android:layout_toStartOf="@+id/thread_select_sim_icon"
-        android:layout_toEndOf="@+id/thread_add_attachment"
-        android:background="@android:color/transparent"
-        android:gravity="center_vertical"
-        android:hint="@string/type_a_message"
-        android:inputType="textCapSentences|textMultiLine"
-        android:minHeight="@dimen/normal_icon_size" />
-
-    <ImageView
-        android:id="@+id/thread_select_sim_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="@dimen/small_margin"
-        android:layout_toStartOf="@+id/thread_character_counter"
-        android:alpha="0.9"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:paddingStart="@dimen/medium_margin"
-        android:paddingTop="@dimen/normal_margin"
-        android:paddingEnd="@dimen/medium_margin"
-        android:paddingBottom="@dimen/normal_margin"
-        android:src="@drawable/ic_sim_vector"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/thread_select_sim_number"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignStart="@+id/thread_select_sim_icon"
-        android:layout_alignTop="@+id/thread_select_sim_icon"
-        android:layout_alignEnd="@+id/thread_select_sim_icon"
-        android:layout_alignBottom="@+id/thread_select_sim_icon"
-        android:gravity="center"
-        android:textSize="@dimen/normal_text_size"
-        android:visibility="gone"
-        tools:text="1" />
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/thread_character_counter"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignTop="@+id/thread_send_message"
-        android:layout_alignBottom="@+id/thread_send_message"
-        android:layout_toStartOf="@+id/thread_send_message"
-        android:gravity="center"
-        android:paddingStart="@dimen/small_margin"
-        android:paddingEnd="@dimen/small_margin"
-        android:text="0"
-        android:textSize="@dimen/normal_text_size"
-        android:visibility="gone"
-        tools:ignore="HardcodedText" />
-
-    <Button
-        android:id="@+id/thread_send_message"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="@dimen/small_margin"
-        android:layout_marginEnd="@dimen/small_margin"
-        android:alpha="0.4"
-        android:background="?selectableItemBackgroundBorderless"
-        android:clickable="false"
-        android:contentDescription="@string/ok"
-        android:drawableTop="@drawable/ic_send_vector"
-        android:paddingVertical="@dimen/small_margin"
-        android:text="@string/sms"
-        android:textSize="@dimen/smaller_text_size" />
-
-</RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/dialog_export_messages.xml b/app/src/main/res/layout/dialog_export_messages.xml
index 25bf1ca3..7fb85583 100644
--- a/app/src/main/res/layout/dialog_export_messages.xml
+++ b/app/src/main/res/layout/dialog_export_messages.xml
@@ -14,57 +14,49 @@
         android:paddingTop="@dimen/activity_margin"
         android:paddingEnd="@dimen/activity_margin">
 
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/export_messages_folder_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/folder"
-            android:textSize="@dimen/smaller_text_size" />
-
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/export_messages_folder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/activity_margin"
-            android:layout_marginBottom="@dimen/activity_margin"
-            android:paddingTop="@dimen/small_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin" />
-
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/export_messages_filename_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/small_margin"
-            android:text="@string/filename_without_json"
-            android:textSize="@dimen/smaller_text_size" />
-
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/export_messages_filename"
+        <com.simplemobiletools.commons.views.MyTextInputLayout
+            android:id="@+id/export_messages_folder_hint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_margin"
-            android:paddingTop="@dimen/normal_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="Messages" />
+            android:hint="@string/folder">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/export_messages_folder"
+                style="@style/UnclickableEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </com.simplemobiletools.commons.views.MyTextInputLayout>
+
+        <com.simplemobiletools.commons.views.MyTextInputLayout
+            android:id="@+id/export_messages_filename_hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/filename_without_json">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/export_messages_filename"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/activity_margin"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/normal_text_size"
+                tools:text="Messages" />
+
+        </com.simplemobiletools.commons.views.MyTextInputLayout>
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/export_sms_checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/activity_margin"
-            android:paddingTop="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
             android:text="@string/export_sms" />
 
         <com.simplemobiletools.commons.views.MyAppCompatCheckbox
             android:id="@+id/export_mms_checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/activity_margin"
-            android:paddingTop="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
             android:text="@string/export_mms" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_selected_contact.xml b/app/src/main/res/layout/item_selected_contact.xml
index aa4b012a..926f0ccb 100644
--- a/app/src/main/res/layout/item_selected_contact.xml
+++ b/app/src/main/res/layout/item_selected_contact.xml
@@ -13,8 +13,8 @@
         android:paddingStart="@dimen/normal_margin"
         android:paddingTop="@dimen/normal_margin"
         android:paddingBottom="@dimen/normal_margin"
-        android:textSize="@dimen/bigger_text_size"
         android:textColor="@color/md_grey_white"
+        android:textSize="@dimen/bigger_text_size"
         tools:text="John" />
 
     <ImageView