diff --git a/app/src/main/java/com/termux/api/SmsInboxAPI.java b/app/src/main/java/com/termux/api/SmsInboxAPI.java
index 04ab81c..c13ef20 100644
--- a/app/src/main/java/com/termux/api/SmsInboxAPI.java
+++ b/app/src/main/java/com/termux/api/SmsInboxAPI.java
@@ -37,20 +37,21 @@ public class SmsInboxAPI {
     static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
         final int offset = intent.getIntExtra("offset", 0);
         final int limit = intent.getIntExtra("limit", 50);
+        final Uri contentURI = typeToContentURI(intent.getIntExtra("type", TextBasedSmsColumns.MESSAGE_TYPE_INBOX));
 
         ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
-                getAllSms(context, out, offset, limit);
+                getAllSms(context, out, offset, limit, contentURI);
             }
         });
     }
 
     @SuppressLint("SimpleDateFormat")
-    public static void getAllSms(Context context, JsonWriter out, int offset, int limit) throws IOException {
+    public static void getAllSms(Context context, JsonWriter out, int offset, int limit, Uri contentURI) throws IOException {
         ContentResolver cr = context.getContentResolver();
         String sortOrder = "date DESC LIMIT + " + limit + " OFFSET " + offset;
-        try (Cursor c = cr.query(Telephony.Sms.Inbox.CONTENT_URI, null, null, null, sortOrder)) {
+        try (Cursor c = cr.query(contentURI, null, null, null, sortOrder)) {
 
             c.moveToLast();
 
@@ -59,7 +60,7 @@ public class SmsInboxAPI {
 
             out.beginArray();
             for (int i = 0, count = c.getCount(); i < count; i++) {
-                // String smsId = c.getString(c.getColumnIndexOrThrow(Telephony.Sms.Inbox._ID));
+                int threadID = c.getInt(c.getColumnIndexOrThrow(TextBasedSmsColumns.THREAD_ID));
                 String smsAddress = c.getString(c.getColumnIndexOrThrow(TextBasedSmsColumns.ADDRESS));
                 String smsBody = c.getString(c.getColumnIndexOrThrow(TextBasedSmsColumns.BODY));
                 boolean read = (c.getInt(c.getColumnIndex(TextBasedSmsColumns.READ)) != 0);
@@ -67,8 +68,11 @@ public class SmsInboxAPI {
                 // long smsSentDate = c.getLong(c.getColumnIndexOrThrow(TextBasedSmsColumns.DATE_SENT));
 
                 String smsSenderName = getContactNameFromNumber(nameCache, context, smsAddress);
+                String messageType = getMessageType(c.getInt(c.getColumnIndexOrThrow(TextBasedSmsColumns.TYPE)));
 
                 out.beginObject();
+                out.name("threadid").value(threadID);
+                out.name("type").value(messageType);
                 out.name("read").value(read);
 
                 if (smsSenderName != null) {
@@ -102,4 +106,39 @@ public class SmsInboxAPI {
         }
     }
 
+    private static String getMessageType(int type) {
+        switch (type)
+        {
+            case TextBasedSmsColumns.MESSAGE_TYPE_INBOX:
+                return "inbox";
+            case TextBasedSmsColumns.MESSAGE_TYPE_SENT:
+                return "sent";
+            case TextBasedSmsColumns.MESSAGE_TYPE_DRAFT:
+                return "draft";
+            case TextBasedSmsColumns.MESSAGE_TYPE_FAILED:
+                return "failed";
+            case TextBasedSmsColumns.MESSAGE_TYPE_OUTBOX:
+                return "outbox";
+            default:
+                return "";
+        }
+    }
+
+    private static Uri typeToContentURI(int type) {
+        switch (type) {
+            case TextBasedSmsColumns.MESSAGE_TYPE_ALL:
+                return Telephony.Sms.CONTENT_URI;
+            case TextBasedSmsColumns.MESSAGE_TYPE_SENT:
+                return Telephony.Sms.Sent.CONTENT_URI;
+            case TextBasedSmsColumns.MESSAGE_TYPE_DRAFT:
+                return Telephony.Sms.Draft.CONTENT_URI;
+            case TextBasedSmsColumns.MESSAGE_TYPE_OUTBOX:
+                return Telephony.Sms.Outbox.CONTENT_URI;
+            case TextBasedSmsColumns.MESSAGE_TYPE_INBOX:
+            default:
+                return Telephony.Sms.Inbox.CONTENT_URI;
+        }
+    }
+
+
 }