diff --git a/package.json b/package.json
index 5e11b039..1818361f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vocechat-web",
-  "version": "0.7.39",
+  "version": "0.7.40",
   "homepage": "https://voce.chat",
   "dependencies": {
     "@metamask/onboarding": "^1.0.1",
diff --git a/src/components/ImagePreview.tsx b/src/components/ImagePreview.tsx
index 99fda6d6..b21995f9 100644
--- a/src/components/ImagePreview.tsx
+++ b/src/components/ImagePreview.tsx
@@ -16,7 +16,8 @@ const ImagePreview = ({ context = "chat" }: Props) => {
     if (!container) return;
     const chatHandler = (evt: MouseEvent) => {
       const target = evt.target as HTMLImageElement;
-      if (target && target.nodeName == "IMG" && target.classList.contains("preview")) {
+      const isMsg = !!target.closest(".vc-msg");
+      if (isMsg && target && target.nodeName == "IMG" && target.classList.contains("preview")) {
         // console.log("click chat", target);
         evt.stopPropagation();
         const thumbnail = target.src;
@@ -28,14 +29,9 @@ const ImagePreview = ({ context = "chat" }: Props) => {
     };
     const markdownHandler = (evt: MouseEvent) => {
       const target = evt.target as HTMLImageElement;
-      const isMarkdown = !!target.closest("#MARKDOWN_CONTAINER");
+      const isMsg = !!target.closest(".vc-msg");
       // 图片 并且没被 a 标签包裹
-      if (
-        isMarkdown &&
-        target &&
-        target.nodeName == "IMG" &&
-        target.parentElement?.tagName !== "A"
-      ) {
+      if (isMsg && target && target.nodeName == "IMG" && target.parentElement?.tagName !== "A") {
         // console.log("click markdown", target);
         evt.stopPropagation();
         const urlObj = new URL(target.src);
diff --git a/src/components/Message/index.tsx b/src/components/Message/index.tsx
index 82472c04..6dbe5622 100644
--- a/src/components/Message/index.tsx
+++ b/src/components/Message/index.tsx
@@ -180,7 +180,7 @@ const Message: FC<IProps> = ({
           </div>
           <div
             className={clsx(
-              `select-text text-gray-800 text-sm wb whitespace-pre-wrap dark:!text-white pr-6 md:pr-0`,
+              `vc-msg select-text text-gray-800 text-sm wb whitespace-pre-wrap dark:!text-white pr-6 md:pr-0`,
               sending && "opacity-90"
             )}
           >