diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index f041c21..ae492e7 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { MessageSquare, Settings, Image, Languages, FileText } from 'lucide-react';
+import { MessageSquare, Settings, Image, Languages, FolderClosed } from 'lucide-react';
 
 interface SidebarProps {
   activePage: string;
@@ -85,7 +85,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
           onClick={() => onChangePage('files')}
           aria-label="File Management"
         >
-          <FileText size={22} />
+          <FolderClosed size={22} />
         </button>
       </div>
 
diff --git a/src/components/pages/FileManagementPage.tsx b/src/components/pages/FileManagementPage.tsx
index 0de22b9..ae306a0 100644
--- a/src/components/pages/FileManagementPage.tsx
+++ b/src/components/pages/FileManagementPage.tsx
@@ -281,38 +281,38 @@ export const FileManagementPage = () => {
   };
 
   // Open file
-//   const handleOpenFile = async (file: FileData) => {
-//     try {
-//       // First save the file to a temporary location
-//       if (!window.electron || !window.electron.saveFile || !window.electron.openFile) {
-//         console.error("Electron API not available");
-//         return;
-//       }
+  const handleOpenFile = async (file: FileData) => {
+    try {
+      // First save the file to a temporary location
+      if (!window.electron || !window.electron.saveFile || !window.electron.openFile) {
+        console.error("Electron API not available");
+        return;
+      }
       
-//       // Save file to temp location and then open it
-//       const saveResult = await window.electron.saveFile(
-//         file.data,
-//         file.name,
-//         file.type || 'application/octet-stream'
-//       );
+      // Save file to temp location and then open it
+      const saveResult = await window.electron.saveFile(
+        file.data,
+        file.name,
+        file.type || 'application/octet-stream'
+      );
       
-//       if (!saveResult.success || !saveResult.filePath) {
-//         if (!saveResult.canceled) {
-//           console.error("Error saving file:", saveResult.error);
-//         }
-//         return;
-//       }
+      if (!saveResult.success || !saveResult.filePath) {
+        if (!saveResult.canceled) {
+          console.error("Error saving file:", saveResult.error);
+        }
+        return;
+      }
       
-//       // Now open the file with the default application
-//       const openResult = await window.electron.openFile(saveResult.filePath);
+      // Now open the file with the default application
+      const openResult = await window.electron.openFile(saveResult.filePath);
       
-//       if (!openResult.success) {
-//         console.error("Error opening file:", openResult.error);
-//       }
-//     } catch (error) {
-//       console.error("Error opening file:", error);
-//     }
-//   };
+      if (!openResult.success) {
+        console.error("Error opening file:", openResult.error);
+      }
+    } catch (error) {
+      console.error("Error opening file:", error);
+    }
+  };
 
   // Format file size
   const formatFileSize = (bytes: number): string => {
@@ -672,13 +672,13 @@ export const FileManagementPage = () => {
                         </td>
                         <td className="px-4 py-3">
                           <div className="flex items-center justify-center space-x-2">
-                            {/* <button
+                            <button
                               onClick={() => handleOpenFile(file)}
                               className="p-2 rounded-md message-icon-btn"
                               title={t("fileManagement.open")}
                             >
                               <FolderOpen size={16} />
-                            </button> */}
+                            </button>
                             <button
                               onClick={() => {
                                 setSelectedFile(file);
diff --git a/src/services/chat-service.ts b/src/services/chat-service.ts
index 2e22062..92a1627 100644
--- a/src/services/chat-service.ts
+++ b/src/services/chat-service.ts
@@ -292,7 +292,7 @@ export class ChatService {
       //#region Save user message with files to database and update title
       // eslint-disable-next-line prefer-const
       let {conversation: updatedConversation, message: userMessage} = await MessageHelper.addUserMessageWithFilesToConversation(
-        content, 
+        content,
         fileContents,
         currentConversation
       );
diff --git a/src/services/message-helper.ts b/src/services/message-helper.ts
index a2ef912..93d5fea 100644
--- a/src/services/message-helper.ts
+++ b/src/services/message-helper.ts
@@ -318,19 +318,19 @@ export class MessageHelper {
         }).join('');
     }
 
-    public static MessagesContentToOpenAIFormat(msgs: Message[]): CoreMessage[] {
+    public static async MessagesContentToOpenAIFormat(msgs: Message[]): Promise<CoreMessage[]> {
         if (!msgs || msgs.length === 0) {
             return [];
         }
 
         console.log('before msgs: ', msgs);
         
-        const results = msgs.map((msg) => {
+        const results = await Promise.all(msgs.map(async (msg) => {
             
             if(msg.role === 'user') {
                 const userMsg: CoreUserMessage = {
                     role: 'user',
-                    content: msg.content.map((content) => {
+                    content: await Promise.all(msg.content.map(async (content) => {
                         if(content.type === MessageContentType.Text) {
                             const textContent: TextPart = {
                                 type: 'text',
@@ -343,9 +343,25 @@ export class MessageHelper {
 
                             console.log('Processing file: ', dataJson.name);
 
+                            const dbService = DatabaseIntegrationService.getInstance();
+
+                            // Get the file data by the file id
+                            const fileData = await dbService.getFile(content.content); //content.content is the file id
+
+                            if(!fileData) {
+                                const emptyText: TextPart = {
+                                    type: 'text',
+                                    text: ''
+                                };
+                                console.log('File not found: ', content.content);
+                                return emptyText;
+                            }
+
+                            const fileBuffer = fileData.data;
+
                             const fileContent: FilePart = {
                                 type: 'file',
-                                data: content.content,
+                                data: fileBuffer,
                                 mimeType: 'application/pdf', // SDK requires pdf mime type, but it supports all mime types
                                 filename: dataJson.name
                             }
@@ -357,7 +373,7 @@ export class MessageHelper {
                             text: ''
                         };
                         return emptyText;
-                    })
+                    })),
                 }
 
                 return userMsg;
@@ -395,7 +411,7 @@ export class MessageHelper {
                 return systemMsg;
             }
             
-        });
+        }));
 
         return results.filter((result) => result !== undefined) as CoreMessage[];
     }
diff --git a/src/services/providers/common-provider-service.ts b/src/services/providers/common-provider-service.ts
index d13537c..940f416 100644
--- a/src/services/providers/common-provider-service.ts
+++ b/src/services/providers/common-provider-service.ts
@@ -146,7 +146,7 @@ export class CommonProviderHelper implements AiServiceProvider {
     toolChoice: ToolChoice<ToolSet> | undefined = undefined
   ): Promise<Message> {
     try {
-      const formattedMessages = MessageHelper.MessagesContentToOpenAIFormat(messages);
+      const formattedMessages = await MessageHelper.MessagesContentToOpenAIFormat(messages);
 
       console.log('formattedMessages: ', formattedMessages);