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 e6f2f710..6066975c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
@@ -82,6 +82,16 @@ class SearchActivity : SimpleActivity() {
                 val conversations = conversationsDB.getConversationsWithText(searchQuery)
                 if (text == mLastSearchedText) {
                     val searchResults = ArrayList<SearchResult>()
+                    conversations.forEach { conversation ->
+                        val searchResult = SearchResult(conversation.title, conversation.phoneNumber, conversation.date, conversation.threadId)
+                        searchResults.add(searchResult)
+                    }
+
+                    messages.forEach { message ->
+                        val searchResult = SearchResult(message.senderName, message.body, message.date, message.threadId)
+                        searchResults.add(searchResult)
+                    }
+
                     runOnUiThread {
                         search_results_list.beVisibleIf(searchResults.isNotEmpty())
                         search_placeholder.beVisibleIf(searchResults.isEmpty())
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt
new file mode 100644
index 00000000..ef4e3746
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/SearchResult.kt
@@ -0,0 +1,3 @@
+package com.simplemobiletools.smsmessenger.models
+
+data class SearchResult(val title: String, val snippet: String, val date: Int, val threadId: Long)