diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index b8f18ca9..8cb0822f 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebase-feed-mobile",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/packages/mobile/src/components/Chat/ChatDetail.tsx b/packages/mobile/src/components/Chat/ChatDetail.tsx
index d10672a0..d25fd759 100644
--- a/packages/mobile/src/components/Chat/ChatDetail.tsx
+++ b/packages/mobile/src/components/Chat/ChatDetail.tsx
@@ -309,7 +309,6 @@ export const ChatDetail = memo(
           type: [Document.types.pdf, Document.types.doc, Document.types.docx], // Don't add support for all files. Keeping it pdf and docs for now
           mode: 'open',
         });
-        console.log(document);
         document.fileCopyUri = fixDocumentURI(document.fileCopyUri || document.uri);
         const asset: Asset = {
           uri: document.fileCopyUri,
diff --git a/packages/mobile/src/components/Chat/MediaMessage.tsx b/packages/mobile/src/components/Chat/MediaMessage.tsx
index 1ee37415..305843c4 100644
--- a/packages/mobile/src/components/Chat/MediaMessage.tsx
+++ b/packages/mobile/src/components/Chat/MediaMessage.tsx
@@ -143,6 +143,7 @@ const InnerMediaMessage = memo(
         style={{
           borderRadius: 10,
           backgroundColor: isDarkMode ? Colors.black : Colors.white,
+          maxWidth: width * 0.8,
         }}
       />
     );
diff --git a/packages/mobile/src/components/ui/Media/MediaGallery.tsx b/packages/mobile/src/components/ui/Media/MediaGallery.tsx
index cd61468f..aecd567e 100644
--- a/packages/mobile/src/components/ui/Media/MediaGallery.tsx
+++ b/packages/mobile/src/components/ui/Media/MediaGallery.tsx
@@ -137,7 +137,9 @@ export const MediaGallery = memo(
                     : 0,
               }}
               onLongPress={onLongPress}
-              onClick={() => onClick?.(index)}
+              onClick={() => {
+                return onClick?.(index);
+              }}
             />
           );
         })}
@@ -150,6 +152,7 @@ export const MediaGallery = memo(
               top: 0,
               left: 0,
               display: 'flex',
+              pointerEvents: 'none',
             }}
           >
             <Pressable
diff --git a/packages/mobile/src/components/ui/Media/VideoWithLoader.tsx b/packages/mobile/src/components/ui/Media/VideoWithLoader.tsx
index a1ba7498..7cec8d8b 100644
--- a/packages/mobile/src/components/ui/Media/VideoWithLoader.tsx
+++ b/packages/mobile/src/components/ui/Media/VideoWithLoader.tsx
@@ -134,6 +134,7 @@ export const VideoWithLoader = memo(
               />
             ) : canDownload ? (
               <LocalVideo
+                odinId={odinId}
                 fileId={fileId}
                 targetDrive={targetDrive}
                 globalTransitId={globalTransitId}
@@ -251,7 +252,6 @@ const LocalVideo = ({
     videoGlobalTransitId: globalTransitId,
     probablyEncrypted,
     payloadKey: payload.key,
-
     lastModified,
   }).fetch;
 
diff --git a/packages/mobile/src/components/ui/OdinImage/hooks/useImage.tsx b/packages/mobile/src/components/ui/OdinImage/hooks/useImage.tsx
index 67cf815e..bd432cda 100644
--- a/packages/mobile/src/components/ui/OdinImage/hooks/useImage.tsx
+++ b/packages/mobile/src/components/ui/OdinImage/hooks/useImage.tsx
@@ -160,6 +160,7 @@ const useImage = (props?: {
             lastModified,
             {
               size,
+              systemFileType,
             }
           );
           if (!imageBlob) return null;
@@ -189,6 +190,7 @@ const useImage = (props?: {
             lastModified,
             {
               size,
+              systemFileType,
             }
           );
           if (!imageBlob) return null;
diff --git a/packages/mobile/src/utils/utils.ts b/packages/mobile/src/utils/utils.ts
index 7b1ae4e6..0c0cb1e9 100644
--- a/packages/mobile/src/utils/utils.ts
+++ b/packages/mobile/src/utils/utils.ts
@@ -1,3 +1,4 @@
+import { getNewId } from '@homebase-id/js-lib/helpers';
 import { InfiniteData } from '@tanstack/react-query';
 import { Image, Linking } from 'react-native';
 import { CachesDirectoryPath, copyFile } from 'react-native-fs';
@@ -95,7 +96,7 @@ export function fixDocumentURI(url: string): string {
 
 export async function fixContentURI(url: string, format?: string): Promise<string> {
     if (url.startsWith('content://') && format) {
-        const destPath = `${CachesDirectoryPath}/${format}`;
+        const destPath = `${CachesDirectoryPath}/${getNewId()}.${format}`;
         await copyFile(url, destPath);
         return `file://${destPath}`;
     }