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 1c0269ed..e6f2f710 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
@@ -11,7 +11,9 @@ import androidx.core.view.MenuItemCompat
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.smsmessenger.R
+import com.simplemobiletools.smsmessenger.extensions.conversationsDB
 import com.simplemobiletools.smsmessenger.extensions.messagesDB
+import com.simplemobiletools.smsmessenger.models.SearchResult
 import kotlinx.android.synthetic.main.activity_search.*
 
 class SearchActivity : SimpleActivity() {
@@ -75,11 +77,14 @@ class SearchActivity : SimpleActivity() {
         search_placeholder_2.beGoneIf(text.length >= 2)
         if (text.length >= 2) {
             ensureBackgroundThread {
-                val messages = messagesDB.getMessagesWithText("%$text%")
+                val searchQuery = "%$text%"
+                val messages = messagesDB.getMessagesWithText(searchQuery)
+                val conversations = conversationsDB.getConversationsWithText(searchQuery)
                 if (text == mLastSearchedText) {
+                    val searchResults = ArrayList<SearchResult>()
                     runOnUiThread {
-                        search_results_list.beVisibleIf(messages.isNotEmpty())
-                        search_placeholder.beVisibleIf(messages.isEmpty())
+                        search_results_list.beVisibleIf(searchResults.isNotEmpty())
+                        search_placeholder.beVisibleIf(searchResults.isEmpty())
                     }
                 }
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt
index 8980593d..534cdc1f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/interfaces/ConversationsDao.kt
@@ -17,6 +17,9 @@ interface ConversationsDao {
     @Query("SELECT * FROM conversations WHERE read = 0")
     fun getUnreadConversations(): List<Conversation>
 
+    @Query("SELECT * FROM conversations WHERE title LIKE :text")
+    fun getConversationsWithText(text: String): List<Conversation>
+
     @Query("UPDATE conversations SET read = 1 WHERE thread_id = :threadId")
     fun markRead(threadId: Long)