diff --git a/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt
index aee395f8..c6f2c49f 100644
--- a/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt
+++ b/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt
@@ -478,12 +478,10 @@ private fun Context.queryCursorUnsafe(
 }
 
 fun Context.getConversationIds(): List<Long> {
-    val uri = "${Threads.CONTENT_URI}?simple=true".toUri()
     val projection = arrayOf(Threads._ID)
-    val selection = "${Threads.MESSAGE_COUNT} > 0"
     val sortOrder = "${Threads.DATE} ASC"
     val conversationIds = mutableListOf<Long>()
-    queryCursor(uri, projection, selection, null, sortOrder, true) { cursor ->
+    queryCursor(Threads.CONTENT_URI, projection, null, null, sortOrder, true) { cursor ->
         val id = cursor.getLongValue(Threads._ID)
         conversationIds.add(id)
     }
diff --git a/app/src/main/kotlin/org/fossify/messages/helpers/MessagesReader.kt b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesReader.kt
index cf8bd424..57e4d7f9 100644
--- a/app/src/main/kotlin/org/fossify/messages/helpers/MessagesReader.kt
+++ b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesReader.kt
@@ -70,7 +70,7 @@ class MessagesReader(private val context: Context) {
                 val body = cursor.getStringValueOrNull(Sms.BODY)
                 val date = cursor.getLongValue(Sms.DATE)
                 val dateSent = cursor.getLongValue(Sms.DATE_SENT)
-                val locked = cursor.getIntValue(Sms.DATE_SENT)
+                val locked = cursor.getIntValue(Sms.LOCKED)
                 val protocol = cursor.getStringValueOrNull(Sms.PROTOCOL)
                 val read = cursor.getIntValue(Sms.READ)
                 val status = cursor.getIntValue(Sms.STATUS)
@@ -115,6 +115,7 @@ class MessagesReader(private val context: Context) {
             Mms.SEEN,
             Mms.TEXT_ONLY,
             Mms.STATUS,
+            Mms.SUBJECT,
             Mms.SUBJECT_CHARSET,
             Mms.SUBSCRIPTION_ID,
             Mms.TRANSACTION_ID