diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index a1e5ff1..83de6e9 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_7_Pro_API_33.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
     <targetSelectedWithDropDown>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
@@ -12,7 +23,7 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-11-10T13:43:49.882091Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-11-10T15:13:15.397276Z" />
     <targetsSelectedWithDialog>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
index 7c9cf97..b6acf50 100644
--- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
+++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
@@ -359,7 +359,8 @@ public class CaregiverDashActivity extends AppCompatActivity implements
                         receiver_image = AppUtil.IMAGE_BASE_URL + careGiverData1.patientDetails.profile_photo;
                     }
 
-                    replaceFragment(new ChatFragment(careGiverData1.patientId + "",
+                    replaceFragment(new ChatFragment(careGiverData1.caregiver_xid + "",
+                            careGiverData1.patientId + "",
                             careGiverData1.first_name,
                             careGiverData1.patientDetails.first_name,
                             sender_image,
diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/chats/ChatFragment.java b/app/src/main/java/com/app/simplitend/patient_dashboard/chats/ChatFragment.java
index f91ae70..c18073e 100644
--- a/app/src/main/java/com/app/simplitend/patient_dashboard/chats/ChatFragment.java
+++ b/app/src/main/java/com/app/simplitend/patient_dashboard/chats/ChatFragment.java
@@ -36,24 +36,27 @@ public class ChatFragment extends Fragment implements SocketHelper.Callback<Mess
 
     private final String author_image, receiver_image;
 
-    private final String patient_id;
+    private final String sender_id, receiver_id;
 
     public static final String SEND = "Send";
 
     public ChatFragment(){
         // required
-        this.patient_id = null;
+        this.sender_id = null;
+        this.receiver_id = null;
         this.nick_name = "NONE";
         this.receiver_name = "NONE";
         this.author_image = null;
         this.receiver_image = null;
     }
 
-    public ChatFragment(String patient_id,
+    public ChatFragment(String sender_id,
+                        String receiver_id,
                         String nick_name,
                         String receiver_name,
                         String sender_image, String receiver_image) {
-        this.patient_id = patient_id;
+        this.sender_id = sender_id;
+        this.receiver_id = receiver_id;
         this.nick_name = nick_name;
         this.receiver_name = receiver_name;
         this.author_image = sender_image;
@@ -71,7 +74,7 @@ public class ChatFragment extends Fragment implements SocketHelper.Callback<Mess
 
         enableDenButton(false);
 
-        if (patient_id != null){
+        if (sender_id != null && receiver_id != null){
             SocketHelper socketHelper = SocketHelper.getInstance();
             socketHelper.establishConnection(new SocketHelper.SockCallBack() {
                 @Override
@@ -92,7 +95,9 @@ public class ChatFragment extends Fragment implements SocketHelper.Callback<Mess
                 }
             });
 
-            socketHelper.getMessage(this, patient_id, nick_name,
+            socketHelper.getMessage(this,
+                    sender_id,
+                    receiver_id,
                     receiver_image,
                     author_image);
         }
@@ -119,7 +124,7 @@ public class ChatFragment extends Fragment implements SocketHelper.Callback<Mess
             }
 
             if (SocketHelper.getInstance().isConnected()) {
-                SocketHelper.getInstance().sendMessage(binding.messageEt.getText().toString().trim(), nick_name, patient_id);
+                SocketHelper.getInstance().sendMessage(binding.messageEt.getText().toString().trim(), nick_name, receiver_id);
                 binding.messageEt.setText("");
                 enableDenButton(false);
             } else {
diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/chats/SocketHelper.java b/app/src/main/java/com/app/simplitend/patient_dashboard/chats/SocketHelper.java
index 01e0131..4f06831 100644
--- a/app/src/main/java/com/app/simplitend/patient_dashboard/chats/SocketHelper.java
+++ b/app/src/main/java/com/app/simplitend/patient_dashboard/chats/SocketHelper.java
@@ -92,28 +92,28 @@ public class SocketHelper {
     }
 
     public void getMessage(final Callback<Message> callback,
-                           @NonNull String patientId,
-                           @NonNull String nickName,
+                           @NonNull String sender_id,
+                           @NonNull String receiver_id,
                            String receiver_image,
                            String author_image) {
-        mSocket.on(patientId, new Emitter.Listener() {
+        mSocket.on(receiver_id, new Emitter.Listener() {
             @Override
             public void call(Object... args) {
                 try {
                     if (args.length >= 3) {
-                        String received_nickName = (String) args[0];
+                        String received_sender_id = (String) args[0];
                         String message_txt = (String) args[1];
                         String date = (String) args[2];
 
                         Message message;
 
-                        if (nickName.equals(received_nickName)){
+                        if (sender_id.equals(received_sender_id)){
                             // Author message
-                            message = new Message(new Author(received_nickName, author_image), message_txt);
+                            message = new Message(new Author(received_sender_id, author_image), message_txt);
                             callback.onMessageSentSuccessfully();
                         }else{
                             // receiver message
-                            message = new Message(new Receiver(received_nickName, receiver_image), message_txt);
+                            message = new Message(new Receiver(received_sender_id, receiver_image), message_txt);
                         }
 
                         callback.onMessageReceived(message);
@@ -124,11 +124,11 @@ public class SocketHelper {
             }
         });
 
-        Log.d(TAG, "LISTENER FOR PATIENT ID : " + patientId);
+        Log.d(TAG, "LISTENER FOR ID : " + receiver_id);
     }
 
-    public void sendMessage(@NonNull String message, @NonNull String nickname, @NonNull String patient_id) {
-        mSocket.emit("chatMessage", nickname, message, patient_id);
+    public void sendMessage(@NonNull String message, @NonNull String sender_id, @NonNull String receiver_id) {
+        mSocket.emit("chatMessage", sender_id, message, receiver_id);
     }
 
     private static final String LOCATION_EVENT_PREFIX = "patientCurrentLocation";
diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java
index 0bd9e05..3b589ba 100644
--- a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java
+++ b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java
@@ -240,6 +240,7 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac
                         getParentFragmentManager().beginTransaction()
                                 .replace(R.id.fragmentContainerView, new ChatFragment(
                                         patientData1.patientId + "",
+                                        patientData1.caregiverId,
                                         patientData1.first_name,
                                         patientData.caregiver_name,
                                         sender_image,
diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/mvvm/models/PatientData.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/mvvm/models/PatientData.java
index f15f2e7..a2787ab 100644
--- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/mvvm/models/PatientData.java
+++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/mvvm/models/PatientData.java
@@ -30,7 +30,7 @@ public class PatientData {
 
     public String one_signal_player_id;
 
-    public String caregiver_name, caregiver_profile_photo;
+    public String caregiver_name, caregiver_profile_photo, caregiverId;
 
     // progress flags
     public int isCareGiverLink