diff --git a/lib/media/media-utils.js b/lib/media/media-utils.js
index 311765f9a..9faeadfcd 100644
--- a/lib/media/media-utils.js
+++ b/lib/media/media-utils.js
@@ -1,90 +1,114 @@
 // @flow
 
 import invariant from 'invariant';
 
-import type { Media } from '../types/media-types.js';
+import type {
+  EncryptedImage,
+  EncryptedVideo,
+  Media,
+} from '../types/media-types.js';
 import type {
   MultimediaMessageInfo,
   RawMultimediaMessageInfo,
 } from '../types/message-types.js';
 import {
   isBlobServiceURI,
   getBlobFetchableURL,
   blobHashFromBlobServiceURI,
 } from '../utils/blob-service.js';
 
 const maxDimensions = Object.freeze({ width: 1920, height: 1920 });
 
 function contentStringForMediaArray(media: $ReadOnlyArray<Media>): string {
   if (media.length === 0) {
     return 'corrupted media';
   } else if (media.length === 1) {
     const type = media[0].type.replace('encrypted_', '');
     return `a ${type}`;
   }
   let firstType;
   for (const single of media) {
     if (!firstType) {
       firstType = single.type;
     }
     if (firstType === single.type) {
       continue;
     } else {
       return 'some media';
     }
   }
   invariant(firstType, 'there should be some media');
   firstType = firstType.replace('encrypted_', '');
   if (firstType === 'photo') {
     firstType = 'image';
   }
   return `some ${firstType}s`;
 }
 
 function isMediaBlobServiceHosted(media: Media): boolean {
   return (
     (!!media.uri && isBlobServiceURI(media.uri)) ||
     (!!media.holder && isBlobServiceURI(media.holder)) ||
     (!!media.thumbnailURI && isBlobServiceURI(media.thumbnailURI)) ||
     (!!media.thumbnailHolder && isBlobServiceURI(media.thumbnailHolder)) ||
     (!!media.blobURI && isBlobServiceURI(media.blobURI)) ||
     (!!media.thumbnailBlobURI && isBlobServiceURI(media.thumbnailBlobURI))
   );
 }
 
 function fetchableMediaURI(uri: string): string {
   if (isBlobServiceURI(uri)) {
     const blobHash = blobHashFromBlobServiceURI(uri);
     return getBlobFetchableURL(blobHash);
   }
 
   return uri;
 }
 
 function multimediaMessagePreview(
   messageInfo: MultimediaMessageInfo | RawMultimediaMessageInfo,
 ): string {
   const mediaContentString = contentStringForMediaArray(messageInfo.media);
   return `sent ${mediaContentString}`;
 }
 
 const localUploadPrefix = 'localUpload';
 
 function isLocalUploadID(id: string): boolean {
   return id.startsWith(localUploadPrefix);
 }
 
 let nextLocalUploadID = 0;
 function getNextLocalUploadID(): string {
   return `${localUploadPrefix}${nextLocalUploadID++}`;
 }
 
+/**
+ * Returns effective multimedia blob URI for encrypted image or video
+ */
+function encryptedMediaBlobURI(media: EncryptedImage | EncryptedVideo): string {
+  const uri = media.blobURI ?? media.holder;
+  invariant(uri, 'encrypted media has no blob URI');
+  return uri;
+}
+
+/**
+ * Returns effective thumbnail blob URI for encrypted video
+ */
+function encryptedVideoThumbnailBlobURI(media: EncryptedVideo): string {
+  const uri = media.thumbnailBlobURI ?? media.thumbnailHolder;
+  invariant(uri, 'encrypted thumbnail has no blob URI');
+  return uri;
+}
+
 export {
   maxDimensions,
   contentStringForMediaArray,
   multimediaMessagePreview,
   isLocalUploadID,
   isMediaBlobServiceHosted,
   getNextLocalUploadID,
   fetchableMediaURI,
+  encryptedMediaBlobURI,
+  encryptedVideoThumbnailBlobURI,
 };