diff --git a/src/components/Message/MessageBase.tsx b/src/components/Message/MessageBase.tsx
index 7513f1cc..ffc1de0b 100644
--- a/src/components/Message/MessageBase.tsx
+++ b/src/components/Message/MessageBase.tsx
@@ -55,11 +55,15 @@ import { useModels } from "../../hooks/use-models";
 import { useSettings } from "../../hooks/use-settings";
 import { useAlert } from "../../hooks/use-alert";
 import ImageModal from "../ImageModal";
+import { useCopyToClipboard } from "react-use";
 
 // Styles for the message text are defined in CSS vs. Chakra-UI
 import "./Message.css";
 import useMobileBreakpoint from "../../hooks/use-mobile-breakpoint";
 import { usingOfficialOpenAI } from "../../lib/ai";
+import { ChatCraftChat } from "../../lib/ChatCraftChat";
+import { useLiveQuery } from "dexie-react-hooks";
+import { useUser } from "../../hooks/use-user";
 
 export interface MessageBaseProps {
   message: ChatCraftMessage;
@@ -106,6 +110,7 @@ function MessageBase({
   disableFork,
   disableEdit,
 }: MessageBaseProps) {
+  const [, copyToClipboard] = useCopyToClipboard();
   const { id, date, text, imageUrls } = message;
   const { models } = useModels();
   const { onCopy } = useClipboard(text);
@@ -123,6 +128,36 @@ function MessageBase({
   const isLongMessage = text.length > 5000;
   const displaySummaryText = !isOpen && (summaryText || isLongMessage);
   const shouldShowDeleteMenu = Boolean(onDeleteBeforeClick || onDeleteClick || onDeleteAfterClick);
+  const chat = useLiveQuery(() => ChatCraftChat.find(chatId), [chatId]);
+  const { user } = useUser();
+  const handleShareMessage = useCallback(async () => {
+    if (!user) {
+      error({
+        title: "Failed to Share Message",
+        message: "Can't share message because user is not logged in",
+      });
+      return;
+    }
+    if (!chat) {
+      console.error("Chat not found");
+      return;
+    }
+    try {
+      // Use the shareSingleMessage method from the chat instance
+      const { url } = await chat.shareSingleMessage(user, message.id);
+      info({
+        title: "Message Shared Successfully",
+        message: `URL has been copied to clipboard`,
+      });
+      copyToClipboard(url);
+    } catch (err) {
+      console.error(err);
+      error({
+        title: "Failed to Share Message",
+        message: "An error occurred while trying to share the message.",
+      });
+    }
+  }, [message.id, user, chat, info, error, copyToClipboard]);
 
   // Wrap the onToggle function with startTransition, state update should be deferred due to long message
   // https://reactjs.org/docs/error-decoder.html?invariant=426
@@ -399,6 +434,19 @@ function MessageBase({
                     </SubMenu>
                   </>
                 )}
+                <MenuDivider />
+                <MenuItem
+                  label="Share Message"
+                  onClick={() => handleShareMessage()}
+                  icon={
+                    <IconButton
+                      variant="ghost"
+                      // icon={<YourShareIcon />} // Replace YourShareIcon with the actual icon you want to use for sharing
+                      aria-label="Share message"
+                      title="Share message"
+                    />
+                  }
+                />
                 {(!disableEdit || onDeleteClick) && <MenuDivider />}
                 {!disableEdit && (
                   <MenuItem
diff --git a/src/lib/ChatCraftChat.ts b/src/lib/ChatCraftChat.ts
index aa00f181..38b7d65c 100644
--- a/src/lib/ChatCraftChat.ts
+++ b/src/lib/ChatCraftChat.ts
@@ -355,6 +355,38 @@ export class ChatCraftChat {
     return shared;
   }
 
+  //function to share single message
+  async shareSingleMessage(user: User, messageId: string) {
+    // Find the message to be shared
+    const messageToShare = this._messages.find((message) => message.id === messageId);
+    if (!messageToShare) {
+      throw new Error("Message not found");
+    }
+
+    // Clone the chat but only include the specified message
+    const clonedChatWithSingleMessage = new ChatCraftChat({
+      messages: [messageToShare.clone()],
+      summary: this.summary, // You might want to adjust the summary for the shared content
+    });
+
+    // Use the existing sharing logic to share the cloned chat
+    const shareUrl = createDataShareUrl(clonedChatWithSingleMessage, user);
+    await createShare(clonedChatWithSingleMessage, user);
+
+    const shared = new SharedChatCraftChat({
+      id: clonedChatWithSingleMessage.id,
+      url: shareUrl,
+      date: clonedChatWithSingleMessage.date,
+      summary: clonedChatWithSingleMessage.summary,
+      chat: clonedChatWithSingleMessage,
+    });
+
+    // Cache this locally in your db as well
+    await db.shared.add(shared.toDB());
+
+    return shared;
+  }
+
   static async delete(id: string) {
     const chat = await ChatCraftChat.find(id);
     if (chat) {