diff --git a/web/hooks/usePath.ts b/web/hooks/usePath.ts
index afdafe11f..315072000 100644
--- a/web/hooks/usePath.ts
+++ b/web/hooks/usePath.ts
@@ -1,6 +1,8 @@
-import { openFileExplorer, joinPath, baseName } from '@janhq/core'
+import { openFileExplorer, joinPath, baseName, fs } from '@janhq/core'
 import { useAtomValue } from 'jotai'
 
+import { getFileInfo } from '@/utils/file'
+
 import { janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
 import { activeAssistantAtom } from '@/helpers/atoms/Assistant.atom'
 import { selectedModelAtom } from '@/helpers/atoms/Model.atom'
@@ -47,13 +49,23 @@ export const usePath = () => {
   const onViewFile = async (id: string) => {
     if (!activeThread) return
 
-    let filePath = undefined
-
     id = await baseName(id)
-    filePath = await joinPath(['threads', `${activeThread.id}/files`, `${id}`])
-    if (!filePath) return
-    const fullPath = await joinPath([janDataFolderPath, filePath])
-    openFileExplorer(fullPath)
+
+    // New ID System
+    if (!id.startsWith('file-')) {
+      const threadFilePath = await joinPath([
+        janDataFolderPath,
+        'threads',
+        `${activeThread.id}/files`,
+        id,
+      ])
+      openFileExplorer(threadFilePath)
+    } else {
+      id = id.split('.')[0]
+      const fileName = (await getFileInfo(id)).filename
+      const filesPath = await joinPath([janDataFolderPath, 'files', fileName])
+      openFileExplorer(filesPath)
+    }
   }
 
   const onViewFileContainer = async () => {
diff --git a/web/screens/Thread/ThreadCenterPanel/ChatInput/index.tsx b/web/screens/Thread/ThreadCenterPanel/ChatInput/index.tsx
index b3246a26b..4f00bbc59 100644
--- a/web/screens/Thread/ThreadCenterPanel/ChatInput/index.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/ChatInput/index.tsx
@@ -126,7 +126,7 @@ const ChatInput = () => {
   const renderPreview = (fileUpload: any) => {
     if (fileUpload) {
       if (fileUpload.type === 'image') {
-        return <ImageUploadPreview file={fileUpload[0].file} />
+        return <ImageUploadPreview file={fileUpload.file} />
       } else {
         return <FileUploadPreview />
       }
diff --git a/web/screens/Thread/ThreadCenterPanel/TextMessage/DocMessage.tsx b/web/screens/Thread/ThreadCenterPanel/TextMessage/DocMessage.tsx
index 69d61d0d5..0051f832e 100644
--- a/web/screens/Thread/ThreadCenterPanel/TextMessage/DocMessage.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/TextMessage/DocMessage.tsx
@@ -1,44 +1,39 @@
-import { memo } from 'react'
-
-import { Tooltip } from '@janhq/joi'
-
-import { FolderOpenIcon } from 'lucide-react'
+import { memo, useEffect, useState } from 'react'
 
 import { usePath } from '@/hooks/usePath'
 
-import { toGibibytes } from '@/utils/converter'
-import { openFileTitle } from '@/utils/titleUtils'
+import { getFileInfo } from '@/utils/file'
 
 import Icon from '../FileUploadPreview/Icon'
 
-const DocMessage = ({ id, name }: { id: string; name?: string }) => {
-  const { onViewFile, onViewFileContainer } = usePath()
+const DocMessage = ({ id }: { id: string }) => {
+  const { onViewFile } = usePath()
+  const [fileInfo, setFileInfo] = useState<
+    { filename: string; id: string } | undefined
+  >()
+  useEffect(() => {
+    if (!fileInfo) {
+      getFileInfo(id).then((data) => {
+        setFileInfo(data)
+      })
+    }
+  }, [fileInfo, id])
 
   return (
     <div className="group/file bg-secondary relative mb-2 inline-flex w-60 cursor-pointer gap-x-3 overflow-hidden rounded-lg p-4">
       <div
-        className="absolute left-0 top-0 z-20 hidden h-full w-full bg-black/20 backdrop-blur-sm group-hover/file:inline-block"
+        className="absolute left-0 top-0 z-20 hidden h-full w-full bg-black/20 opacity-50 group-hover/file:inline-block"
         onClick={() => onViewFile(`${id}.pdf`)}
       />
-      <Tooltip
-        trigger={
-          <div
-            className="absolute right-2 top-2 z-20 hidden h-8 w-8 cursor-pointer items-center justify-center rounded-md bg-[hsla(var(--app-bg))] group-hover/file:flex"
-            onClick={onViewFileContainer}
-          >
-            <FolderOpenIcon size={20} />
-          </div>
-        }
-        content={<span>{openFileTitle()}</span>}
-      />
+
       <Icon type="pdf" />
       <div className="w-full">
-        <h6 className="line-clamp-1 w-4/5 font-medium">
-          {name?.replaceAll(/[-._]/g, ' ')}
+        <h6 className="line-clamp-1 w-4/5 overflow-hidden font-medium">
+          {fileInfo?.filename}
         </h6>
-        {/* <p className="text-[hsla(var(--text-secondary)]">
-          {toGibibytes(Number(size))}
-        </p> */}
+        <p className="text-[hsla(var(--text-secondary)] line-clamp-1 overflow-hidden truncate">
+          {fileInfo?.id ?? id}
+        </p>
       </div>
     </div>
   )
diff --git a/web/screens/Thread/ThreadCenterPanel/TextMessage/ImageMessage.tsx b/web/screens/Thread/ThreadCenterPanel/TextMessage/ImageMessage.tsx
index e83d35fbb..14041721b 100644
--- a/web/screens/Thread/ThreadCenterPanel/TextMessage/ImageMessage.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/TextMessage/ImageMessage.tsx
@@ -1,34 +1,11 @@
 import { memo } from 'react'
 
-import { Tooltip } from '@janhq/joi'
-
-import { FolderOpenIcon } from 'lucide-react'
-
-import { usePath } from '@/hooks/usePath'
-
-import { openFileTitle } from '@/utils/titleUtils'
-
 import { RelativeImage } from '../TextMessage/RelativeImage'
 
 const ImageMessage = ({ image }: { image: string }) => {
-  const { onViewFile, onViewFileContainer } = usePath()
-
   return (
-    <div className="group/image relative mb-2 inline-flex cursor-pointer overflow-hidden rounded-xl">
-      <div className="left-0 top-0 z-20 h-full w-full group-hover/image:inline-block">
-        <RelativeImage src={image} onClick={() => onViewFile(image)} />
-      </div>
-      <Tooltip
-        trigger={
-          <div
-            className="absolute right-2 top-2 z-20 hidden h-8 w-8 cursor-pointer items-center justify-center rounded-md bg-[hsla(var(--app-bg))] group-hover/image:flex"
-            onClick={onViewFileContainer}
-          >
-            <FolderOpenIcon size={20} />
-          </div>
-        }
-        content={<span>{openFileTitle()}</span>}
-      />
+    <div className="group/file relative mb-2 inline-flex overflow-hidden rounded-xl">
+      <RelativeImage src={image} />
     </div>
   )
 }
diff --git a/web/screens/Thread/ThreadCenterPanel/TextMessage/RelativeImage.tsx b/web/screens/Thread/ThreadCenterPanel/TextMessage/RelativeImage.tsx
index 72d2a9365..bfd13b0ef 100644
--- a/web/screens/Thread/ThreadCenterPanel/TextMessage/RelativeImage.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/TextMessage/RelativeImage.tsx
@@ -7,7 +7,7 @@ export const RelativeImage = ({
   onClick,
 }: {
   src: string
-  onClick: () => void
+  onClick?: () => void
 }) => {
   const [path, setPath] = useState<string>('')
 
@@ -17,9 +17,12 @@ export const RelativeImage = ({
     })
   }, [])
   return (
-    <button onClick={onClick}>
+    <button
+      onClick={onClick}
+      className={onClick ? 'cursor-pointer' : 'cursor-default'}
+    >
       <img
-        className="aspect-auto h-[300px] cursor-pointer"
+        className="aspect-auto h-[300px]"
         alt={src}
         src={src.includes('files/') ? `file://${path}/${src}` : src}
       />
diff --git a/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx b/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx
index fe42ef2e1..0af9b128e 100644
--- a/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/TextMessage/index.tsx
@@ -125,7 +125,9 @@ const MessageContainer: React.FC<
         >
           <>
             {image && <ImageMessage image={image} />}
-            {attachedFile && <DocMessage id={props.id} name={props.id} />}
+            {attachedFile && (
+              <DocMessage id={props.attachments?.[0]?.file_id ?? props.id} />
+            )}
 
             {editMessage === props.id ? (
               <div>
diff --git a/web/utils/file.ts b/web/utils/file.ts
index 83c9107c6..e20a75dc3 100644
--- a/web/utils/file.ts
+++ b/web/utils/file.ts
@@ -47,3 +47,12 @@ export const uploader = () => {
   })
   return uppy
 }
+
+/**
+ * Get the file information from the server.
+ */
+export const getFileInfo = (id: string) => {
+  return fetch(`${API_BASE_URL}/v1/files/${id}`)
+    .then((e) => e.json())
+    .catch(() => undefined)
+}