diff --git a/public/locale/en.json b/public/locale/en.json
index 400a11697e1..c5c14ad1f89 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -53,6 +53,7 @@
   "ENCOUNTER_TAB__files": "Files",
   "ENCOUNTER_TAB__medicines": "Medicines",
   "ENCOUNTER_TAB__neurological_monitoring": "Neuro",
+  "ENCOUNTER_TAB__notes": "Notes",
   "ENCOUNTER_TAB__nursing": "Nursing",
   "ENCOUNTER_TAB__plots": "Plots",
   "ENCOUNTER_TAB__pressure_sore": "Pressure Sore",
@@ -1444,8 +1445,8 @@
   "qualification": "Qualification",
   "qualification_required": "Qualification is required",
   "quantity_approved": "Quantity Approved",
-  "quantity_required": "Quantity Required",
   "quantity_requested": "Quantity Requested",
+  "quantity_required": "Quantity Required",
   "raise_consent_request": "Raise a consent request to fetch patient records over ABDM",
   "ration_card__APL": "APL",
   "ration_card__BPL": "BPL",
@@ -1676,10 +1677,10 @@
   "test_type": "Type of test done",
   "tested_on": "Tested on",
   "thank_you_for_choosing": "Thank you for choosing our care service",
-  "time": "Time",
-  "time_slot": "Time Slot",
   "the_request_for_resources_placed_by_yourself_is": "The request for resource (details below) placed by yourself is",
   "third_party_software_licenses": "Third Party Software Licenses",
+  "time": "Time",
+  "time_slot": "Time Slot",
   "title_of_request": "Title of Request",
   "titrate_dosage": "Titrate Dosage",
   "to": "to",
@@ -1871,4 +1872,4 @@
   "you_need_at_least_a_location_to_create_an_assest": "You need at least a location to create an assest.",
   "zoom_in": "Zoom In",
   "zoom_out": "Zoom Out"
-}
\ No newline at end of file
+}
diff --git a/src/Utils/request/api.tsx b/src/Utils/request/api.tsx
index d4d2ad617a7..2273864d75d 100644
--- a/src/Utils/request/api.tsx
+++ b/src/Utils/request/api.tsx
@@ -101,6 +101,8 @@ import {
   FacilityOrganizationCreate,
   FacilityOrganizationResponse,
 } from "@/types/facilityOrganization/facilityOrganization";
+import { Message } from "@/types/notes/messages";
+import { Thread } from "@/types/notes/threads";
 import {
   Organization,
   OrganizationResponse,
@@ -1640,6 +1642,35 @@ const routes = {
     },
   },
 
+  // Notes Routes
+  notes: {
+    patient: {
+      listThreads: {
+        path: "/api/v1/patient/{patientId}/thread/",
+        method: "GET",
+        TRes: Type<PaginatedResponse<Thread>>(),
+        TQuery: Type<{ encounter: string }>(),
+      },
+      createThread: {
+        path: "/api/v1/patient/{patientId}/thread/",
+        method: "POST",
+        TRes: Type<Thread>(),
+        TBody: Type<{ title: string; encounter: string }>(),
+      },
+      getMessages: {
+        path: "/api/v1/patient/{patientId}/thread/{threadId}/note/",
+        method: "GET",
+        TRes: Type<PaginatedResponse<Message>>(),
+      },
+      postMessage: {
+        path: "/api/v1/patient/{patientId}/thread/{threadId}/note/",
+        method: "POST",
+        TRes: Type<Message>(),
+        TBody: Type<{ message: string }>(),
+      },
+    },
+  },
+
   // Encounter Routes
   encounter: {
     list: {
diff --git a/src/pages/Encounters/EncounterShow.tsx b/src/pages/Encounters/EncounterShow.tsx
index 2a8c2fa8225..085adef35bb 100644
--- a/src/pages/Encounters/EncounterShow.tsx
+++ b/src/pages/Encounters/EncounterShow.tsx
@@ -22,6 +22,8 @@ import { EncounterUpdatesTab } from "@/pages/Encounters/tabs/EncounterUpdatesTab
 import { Encounter } from "@/types/emr/encounter";
 import { Patient } from "@/types/emr/newPatient";
 
+import { EncounterNotesTab } from "./tabs/EncounterNotesTab";
+
 export interface EncounterTabProps {
   facilityId: string;
   encounter: Encounter;
@@ -34,6 +36,7 @@ const defaultTabs = {
   plots: EncounterPlotsTab,
   medicines: EncounterMedicinesTab,
   files: EncounterFilesTab,
+  notes: EncounterNotesTab,
   // nursing: EncounterNursingTab,
   // neurological_monitoring: EncounterNeurologicalMonitoringTab,
   // pressure_sore: EncounterPressureSoreTab,
diff --git a/src/pages/Encounters/tabs/EncounterNotesTab.tsx b/src/pages/Encounters/tabs/EncounterNotesTab.tsx
new file mode 100644
index 00000000000..ad6273c3fc3
--- /dev/null
+++ b/src/pages/Encounters/tabs/EncounterNotesTab.tsx
@@ -0,0 +1,373 @@
+import {
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from "@tanstack/react-query";
+import { Plus, Send } from "lucide-react";
+import { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useInView } from "react-intersection-observer";
+
+import { cn } from "@/lib/utils";
+
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Textarea } from "@/components/ui/textarea";
+
+import Loading from "@/components/Common/Loading";
+
+import useAuthUser from "@/hooks/useAuthUser";
+
+import routes from "@/Utils/request/api";
+import mutate from "@/Utils/request/mutate";
+import query from "@/Utils/request/query";
+import { EncounterTabProps } from "@/pages/Encounters/EncounterShow";
+import { Message } from "@/types/notes/messages";
+import { Thread } from "@/types/notes/threads";
+
+const MessageSkeleton = () => (
+  <div className="space-y-4">
+    {[1, 2, 3].map((i) => (
+      <div key={i} className="p-4 rounded-lg bg-muted">
+        <div className="flex justify-between text-sm mb-2">
+          <Skeleton className="h-4 w-[100px]" />
+        </div>
+        <Skeleton className="h-4 w-[80%] mb-2" />
+        <Skeleton className="h-4 w-[60%]" />
+      </div>
+    ))}
+  </div>
+);
+
+const ThreadItem = ({
+  thread,
+  isSelected,
+  onClick,
+}: {
+  thread: Thread;
+  isSelected: boolean;
+  onClick: () => void;
+}) => (
+  <div
+    className={`relative p-3 cursor-pointer rounded-lg transition-colors ${
+      isSelected ? "bg-primary/10" : "hover:bg-muted"
+    }`}
+    onClick={onClick}
+  >
+    <div className="flex justify-between items-center">
+      <h4 className="font-medium text-sm">{thread.title}</h4>
+      {isSelected && <div className="w-1.5 h-1.5 rounded-full bg-primary" />}
+    </div>
+  </div>
+);
+
+const UserAvatar = ({ user }: { user: Message["created_by"] }) => {
+  const initials = user.username.charAt(0).toUpperCase();
+
+  return user.profile_picture_url ? (
+    <img
+      src={user.profile_picture_url}
+      alt={user.username}
+      className="w-8 h-8 rounded-full object-cover"
+    />
+  ) : (
+    <div className="w-8 h-8 rounded-full bg-primary/10 flex items-center justify-center text-primary font-medium">
+      {initials}
+    </div>
+  );
+};
+
+const MessageItem = ({ message }: { message: Message }) => {
+  const authUser = useAuthUser();
+  const isCurrentUser = authUser?.external_id === message.created_by.id;
+
+  return (
+    <div
+      className={cn(
+        "flex w-full mb-4 animate-in fade-in-0 slide-in-from-bottom-4",
+        isCurrentUser ? "justify-end" : "justify-start",
+      )}
+    >
+      <div
+        className={cn(
+          "flex max-w-[80%] items-start gap-3",
+          isCurrentUser ? "flex-row-reverse" : "flex-row",
+        )}
+      >
+        <div className="flex-shrink-0 mt-1">
+          <UserAvatar user={message.created_by} />
+        </div>
+
+        <div
+          className={cn(
+            "flex flex-col",
+            isCurrentUser ? "items-end" : "items-start",
+          )}
+        >
+          <span className="text-xs text-muted-foreground mb-1">
+            {message.created_by.username}
+          </span>
+          <div
+            className={cn(
+              "p-3 rounded-lg break-words",
+              isCurrentUser
+                ? "bg-primary-100 text-primary-foreground ml-auto rounded-br-none"
+                : "bg-muted mr-auto rounded-bl-none",
+            )}
+          >
+            <p className="whitespace-pre-wrap">{message.message}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+interface PaginatedResponse<T> {
+  count: number;
+  next: string | null;
+  previous: string | null;
+  results: T[];
+}
+
+export const EncounterNotesTab = ({ encounter }: EncounterTabProps) => {
+  const { t } = useTranslation();
+  const queryClient = useQueryClient();
+  const [selectedThread, setSelectedThread] = useState<string | null>(null);
+  const [showNewThreadForm, setShowNewThreadForm] = useState(false);
+  const [newThreadTitle, setNewThreadTitle] = useState("");
+  const [newMessage, setNewMessage] = useState("");
+  const LIMIT = 20;
+  const { ref, inView } = useInView();
+
+  // Fetch threads
+  const { data: threadsData, isLoading: threadsLoading } = useQuery({
+    queryKey: ["threads", encounter.id],
+    queryFn: query(routes.notes.patient.listThreads, {
+      pathParams: { patientId: encounter.patient.id },
+      queryParams: { encounter: encounter.id },
+    }),
+  });
+
+  // Auto-select the first thread when data is loaded
+  useEffect(() => {
+    if (threadsData?.results.length && !selectedThread) {
+      setSelectedThread(threadsData.results[0].id);
+    }
+  }, [threadsData, selectedThread]);
+
+  // Fetch messages with offset pagination
+  const {
+    data: messagesData,
+    isLoading: messagesLoading,
+    hasNextPage,
+    fetchNextPage,
+    isFetchingNextPage,
+  } = useInfiniteQuery<PaginatedResponse<Message>>({
+    queryKey: ["messages", selectedThread],
+    queryFn: async ({ pageParam = 0 }) => {
+      const response = await query(routes.notes.patient.getMessages, {
+        pathParams: {
+          patientId: encounter.patient.id,
+          threadId: selectedThread!,
+        },
+        queryParams: {
+          limit: String(LIMIT),
+          offset: String(pageParam),
+        },
+      })({ signal: new AbortController().signal });
+      return response as PaginatedResponse<Message>;
+    },
+    initialPageParam: 0,
+    getNextPageParam: (lastPage, allPages) => {
+      const currentOffset = allPages.length * LIMIT;
+      return currentOffset < lastPage.count ? currentOffset : null;
+    },
+    enabled: !!selectedThread,
+  });
+
+  // Add effect for infinite scroll
+  useEffect(() => {
+    if (inView && hasNextPage) {
+      fetchNextPage();
+    }
+  }, [inView, hasNextPage, fetchNextPage]);
+
+  // Create thread mutation
+  const createThreadMutation = useMutation({
+    mutationFn: mutate(routes.notes.patient.createThread, {
+      pathParams: { patientId: encounter.patient.id },
+    }),
+    onSuccess: (newThread) => {
+      queryClient.invalidateQueries({ queryKey: ["threads"] });
+      setNewThreadTitle("");
+      setShowNewThreadForm(false);
+      // Select the newly created thread
+      setSelectedThread((newThread as { id: string }).id);
+    },
+  });
+
+  // Create message mutation
+  const createMessageMutation = useMutation({
+    mutationFn: mutate(routes.notes.patient.postMessage, {
+      pathParams: {
+        patientId: encounter.patient.id,
+        threadId: selectedThread!,
+      },
+    }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["messages", selectedThread] });
+      setNewMessage("");
+    },
+  });
+
+  const handleCreateThread = () => {
+    createThreadMutation.mutate({
+      title: newThreadTitle,
+      encounter: encounter.id,
+    });
+  };
+
+  if (threadsLoading) {
+    return <Loading />;
+  }
+
+  return (
+    <div className="grid grid-cols-12 gap-4 h-[calc(100vh-12rem)]">
+      {/* Threads List - Make it more compact */}
+      <div className="col-span-3 border-r">
+        <div className="space-y-4 p-4">
+          <div
+            role="button"
+            tabIndex={0}
+            className="flex items-center text-sm hover:text-primary transition-colors cursor-pointer"
+            onClick={() => setShowNewThreadForm(true)}
+          >
+            <Plus className="mr-2 h-4 w-4" />
+            {t("Create New Thread")}
+          </div>
+
+          {showNewThreadForm && (
+            <div className="p-3 border rounded-lg bg-muted/50">
+              <Input
+                placeholder={t("Thread Title")}
+                value={newThreadTitle}
+                onChange={(e) => setNewThreadTitle(e.target.value)}
+                className="mb-2"
+                autoFocus
+              />
+              <div className="flex justify-end gap-2">
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  onClick={() => {
+                    setShowNewThreadForm(false);
+                    setNewThreadTitle("");
+                  }}
+                >
+                  {t("Cancel")}
+                </Button>
+                <Button
+                  size="sm"
+                  onClick={handleCreateThread}
+                  disabled={!newThreadTitle}
+                >
+                  {t("Create")}
+                </Button>
+              </div>
+            </div>
+          )}
+
+          <ScrollArea className="h-[calc(100vh-16rem)]">
+            <div className="space-y-1 pr-4">
+              {threadsData?.results.map((thread) => (
+                <ThreadItem
+                  key={thread.id}
+                  thread={thread}
+                  isSelected={selectedThread === thread.id}
+                  onClick={() => setSelectedThread(thread.id)}
+                />
+              ))}
+            </div>
+          </ScrollArea>
+        </div>
+      </div>
+
+      {/* Messages Area - Make it more chat-like */}
+      <div className="col-span-9 flex flex-col">
+        {selectedThread ? (
+          <>
+            {messagesLoading ? (
+              <div className="flex-1 p-4">
+                <MessageSkeleton />
+              </div>
+            ) : (
+              <div className="flex flex-col h-full">
+                {/* Messages List */}
+                <ScrollArea className="flex-1 px-4">
+                  <div className="flex flex-col-reverse">
+                    {isFetchingNextPage && (
+                      <div className="py-2">
+                        <MessageSkeleton />
+                      </div>
+                    )}
+                    {messagesData?.pages.map((page) =>
+                      page.results.map((message) => (
+                        <MessageItem key={message.id} message={message} />
+                      )),
+                    )}
+                    <div ref={ref} />
+                  </div>
+                </ScrollArea>
+
+                {/* New Message Input */}
+                <div className="border-t bg-background p-4">
+                  <form
+                    onSubmit={(e) => {
+                      e.preventDefault();
+                      if (newMessage.trim()) {
+                        createMessageMutation.mutate({ message: newMessage });
+                      }
+                    }}
+                    className="flex gap-2"
+                  >
+                    <Textarea
+                      placeholder={t("Type a message...")}
+                      value={newMessage}
+                      onChange={(e) => setNewMessage(e.target.value)}
+                      className="min-h-[2.5rem] max-h-[10rem]"
+                      onKeyDown={(e) => {
+                        if (e.key === "Enter" && !e.shiftKey) {
+                          e.preventDefault();
+                          if (newMessage.trim()) {
+                            createMessageMutation.mutate({
+                              message: newMessage,
+                            });
+                          }
+                        }
+                      }}
+                    />
+                    <Button
+                      type="submit"
+                      size="icon"
+                      disabled={!newMessage.trim()}
+                    >
+                      <Send className="h-4 w-4" />
+                    </Button>
+                  </form>
+                </div>
+              </div>
+            )}
+          </>
+        ) : (
+          <div className="flex items-center justify-center h-full text-muted-foreground">
+            {t("Select a thread to start messaging")}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/src/types/notes/messages.ts b/src/types/notes/messages.ts
new file mode 100644
index 00000000000..434850f519c
--- /dev/null
+++ b/src/types/notes/messages.ts
@@ -0,0 +1,14 @@
+import { UserBase } from "@/types/user/user";
+
+export interface Message {
+  id: string;
+  message: string;
+  message_history: Record<string, unknown>;
+  created_by: UserBase;
+  updated_by: UserBase;
+}
+
+export interface MessagesResponse {
+  count: number;
+  results: Message[];
+}
diff --git a/src/types/notes/threads.ts b/src/types/notes/threads.ts
new file mode 100644
index 00000000000..eb77dcea272
--- /dev/null
+++ b/src/types/notes/threads.ts
@@ -0,0 +1,9 @@
+export interface Thread {
+  id: string;
+  title: string;
+}
+
+export interface ThreadsResponse {
+  count: number;
+  results: Thread[];
+}