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 34f7624c..c75b39c5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
@@ -112,14 +112,19 @@ class SearchActivity : SimpleActivity() {
                         search_results_list.beVisibleIf(searchResults.isNotEmpty())
                         search_placeholder.beVisibleIf(searchResults.isEmpty())
 
-                        SearchResultsAdapter(this, searchResults, search_results_list) {
-                            Intent(this, ThreadActivity::class.java).apply {
-                                putExtra(THREAD_ID, (it as SearchResult).threadId)
-                                putExtra(THREAD_TITLE, it.title)
-                                startActivity(this)
+                        val currAdapter = search_results_list.adapter
+                        if (currAdapter == null) {
+                            SearchResultsAdapter(this, searchResults, search_results_list, text) {
+                                Intent(this, ThreadActivity::class.java).apply {
+                                    putExtra(THREAD_ID, (it as SearchResult).threadId)
+                                    putExtra(THREAD_TITLE, it.title)
+                                    startActivity(this)
+                                }
+                            }.apply {
+                                search_results_list.adapter = this
                             }
-                        }.apply {
-                            search_results_list.adapter = this
+                        } else {
+                            (currAdapter as SearchResultsAdapter).updateItems(searchResults, text)
                         }
                     }
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt
index 660c3e6b..01df81e2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import com.bumptech.glide.Glide
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.extensions.getTextSize
+import com.simplemobiletools.commons.extensions.highlightTextPart
 import com.simplemobiletools.commons.helpers.SimpleContactsHelper
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.smsmessenger.R
@@ -15,9 +16,12 @@ import com.simplemobiletools.smsmessenger.models.SearchResult
 import kotlinx.android.synthetic.main.item_search_result.view.*
 import java.util.*
 
-class SearchResultsAdapter(activity: SimpleActivity, var searchResults: ArrayList<SearchResult>, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) :
-    MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
+class SearchResultsAdapter(
+    activity: SimpleActivity, var searchResults: ArrayList<SearchResult>, recyclerView: MyRecyclerView, highlightText: String, itemClick: (Any) -> Unit
+) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
+
     private var fontSize = activity.getTextSize()
+    private var textToHighlight = highlightText
 
     override fun getActionMenuId() = 0
 
@@ -49,16 +53,27 @@ class SearchResultsAdapter(activity: SimpleActivity, var searchResults: ArrayLis
 
     override fun getItemCount() = searchResults.size
 
+    fun updateItems(newItems: ArrayList<SearchResult>, highlightText: String = "") {
+        if (newItems.hashCode() != searchResults.hashCode()) {
+            searchResults = newItems.clone() as ArrayList<SearchResult>
+            textToHighlight = highlightText
+            notifyDataSetChanged()
+        } else if (textToHighlight != highlightText) {
+            textToHighlight = highlightText
+            notifyDataSetChanged()
+        }
+    }
+
     private fun setupView(view: View, searchResult: SearchResult) {
         view.apply {
             search_result_title.apply {
-                text = searchResult.title
+                text = searchResult.title.highlightTextPart(textToHighlight, adjustedPrimaryColor)
                 setTextColor(textColor)
                 setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 1.2f)
             }
 
             search_result_snippet.apply {
-                text = searchResult.snippet
+                text = searchResult.snippet.highlightTextPart(textToHighlight, adjustedPrimaryColor)
                 setTextColor(textColor)
                 setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.9f)
             }