diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2aa763474..a098c8ff9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -174,8 +174,7 @@
 
         <activity
             android:name=".messagesearch.MessageSearchActivity"
-            android:theme="@style/AppTheme"
-            android:exported="false" />
+            android:theme="@style/AppTheme" />
 
         <receiver android:name=".receivers.PackageReplacedReceiver">
             <intent-filter>
diff --git a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
index 73aa57d50..4fb9cd087 100644
--- a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
@@ -193,14 +193,14 @@ class MessageSearchActivity : BaseActivity() {
     private fun showInitial() {
         displayLoading(false)
         binding.messageSearchRecycler.visibility = View.GONE
-        binding.emptyContainer.emptyListViewHeadline.text = "Start typing to search..."
+        binding.emptyContainer.emptyListViewHeadline.text = getString(R.string.message_search_begin_typing)
         binding.emptyContainer.emptyListView.visibility = View.VISIBLE
     }
 
     private fun showEmpty() {
         displayLoading(false)
         binding.messageSearchRecycler.visibility = View.GONE
-        binding.emptyContainer.emptyListViewHeadline.text = "No search results"
+        binding.emptyContainer.emptyListViewHeadline.text = getString(R.string.message_search_begin_empty)
         binding.emptyContainer.emptyListView.visibility = View.VISIBLE
     }
 
@@ -229,7 +229,7 @@ class MessageSearchActivity : BaseActivity() {
     }
 
     private fun setupSearchView() {
-        searchView.queryHint = getString(R.string.nc_search_hint)
+        searchView.queryHint = getString(R.string.message_search_hint)
         searchViewDisposable = observeSearchView(searchView)
             .debounce { query ->
                 when {
diff --git a/app/src/main/res/layout/activity_message_search.xml b/app/src/main/res/layout/activity_message_search.xml
index 731a31058..f7c373f13 100644
--- a/app/src/main/res/layout/activity_message_search.xml
+++ b/app/src/main/res/layout/activity_message_search.xml
@@ -24,6 +24,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_default"
+    tools:ignore="Overdraw"
     tools:context=".messagesearch.MessageSearchActivity">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cce6394d6..953a5ea68 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -518,13 +518,17 @@
     <string name="shared_items_voice">Voice</string>
     <string name="shared_items_other">Other</string>
 
+    <!-- Message search -->
+    <string name="messages">Messages</string>
+    <string name="load_more_results">Load more results</string>
+    <string name="message_search_hint">Search…</string>
+    <string name="message_search_begin_typing">Start typing to search…</string>
+    <string name="message_search_begin_empty">No search results</string>
+
     <string name="title_attachments">Attachments</string>
 
     <string name="reactions_tab_all">All</string>
     <string name="send_without_notification">Send without notification</string>
     <string name="call_without_notification">Call without notification</string>
-    <string name="messages">Messages</string>
-    <string name="load_more_results">Load more results</string>
-    <string name="nc_search_hint">Search…</string>
 
 </resources>