diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4549bc12..80356187 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.14" android:versionCode="284" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.15" android:versionCode="285" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/android/src/com/volla/launcher/service/NotificationListenerExampleService.java b/android/src/com/volla/launcher/service/NotificationListenerExampleService.java
index 916fd8a8..0a5d1395 100644
--- a/android/src/com/volla/launcher/service/NotificationListenerExampleService.java
+++ b/android/src/com/volla/launcher/service/NotificationListenerExampleService.java
@@ -247,12 +247,16 @@ public void onNotificationPosted(StatusBarNotification sbn){
 	    Log.d(TAG, "Keeping Volla notifications messages");
             repository.insertMessage(msg);
  
-            users.uuid = String.valueOf(msg.getUuid());
+            users.uuid = msg.getSelfDisplayName();
             users.body = msg.getText();
-            users.user_name = title;
+            users.user_name = String.valueOf(msg.getUuid());
             users.user_contact_number = "";
             users.read = false;
-            users.isSent = false;
+            if(msg.getSelfDisplayName() != null && msg.getSelfDisplayName().length()>=1){
+                users.isSent = false;
+            } else {
+                users.isSent = true;
+            }
             users.notification = notificationStr;
             users.timeStamp = msg.getTimeStamp();
             repository.insertUser(users);
diff --git a/android/src/com/volla/launcher/worker/SignalWorker.java b/android/src/com/volla/launcher/worker/SignalWorker.java
index eedd856d..ff631c6e 100644
--- a/android/src/com/volla/launcher/worker/SignalWorker.java
+++ b/android/src/com/volla/launcher/worker/SignalWorker.java
@@ -168,9 +168,9 @@ static void retriveMessageThreads(Map message, Activity activity){
             for (Users m : it) {
                 Map reply = new HashMap();
                 reply.put("id", m.getId());
-                reply.put("thread_id", m.getUuid());
+                reply.put("thread_id", m.getUser_name());
                 reply.put("body", m.getBody());
-                reply.put("person", m.getUser_name());
+                reply.put("person",  m.getUuid());
                 reply.put("address", "");
                 reply.put("date", Long.toString(m.getTimeStamp()));
                 reply.put("read", m.getRead());