diff --git a/ts/components/ForwardMessageModal.stories.tsx b/ts/components/ForwardMessageModal.stories.tsx
index beb8f3daff..050003a226 100644
--- a/ts/components/ForwardMessageModal.stories.tsx
+++ b/ts/components/ForwardMessageModal.stories.tsx
@@ -8,7 +8,7 @@ import { action } from '@storybook/addon-actions';
 import { text } from '@storybook/addon-knobs';
 
 import enMessages from '../../_locales/en/messages.json';
-import type { AttachmentDraftType } from '../types/Attachment';
+import type { AttachmentType } from '../types/Attachment';
 import type { PropsType } from './ForwardMessageModal';
 import { ForwardMessageModal } from './ForwardMessageModal';
 import { IMAGE_JPEG, VIDEO_MP4, stringToMIMEType } from '../types/MIME';
@@ -16,9 +16,9 @@ import { getDefaultConversation } from '../test-both/helpers/getDefaultConversat
 import { setupI18n } from '../util/setupI18n';
 import { StorybookThemeContext } from '../../.storybook/StorybookThemeContext';
 
-const createDraftAttachment = (
-  props: Partial<AttachmentDraftType> = {}
-): AttachmentDraftType => ({
+const createAttachment = (
+  props: Partial<AttachmentType> = {}
+): AttachmentType => ({
   pending: false,
   path: 'fileName.jpg',
   contentType: stringToMIMEType(
@@ -83,7 +83,7 @@ story.add('link preview', () => {
           date: Date.now(),
           domain: 'https://www.signal.org',
           url: 'signal.org',
-          image: createDraftAttachment({
+          image: createAttachment({
             url: '/fixtures/kitten-4-112-112.jpg',
             contentType: IMAGE_JPEG,
           }),
@@ -101,15 +101,15 @@ story.add('media attachments', () => {
     <ForwardMessageModal
       {...useProps({
         attachments: [
-          createDraftAttachment({
+          createAttachment({
             pending: true,
           }),
-          createDraftAttachment({
+          createAttachment({
             contentType: IMAGE_JPEG,
             fileName: 'tina-rolf-269345-unsplash.jpg',
             url: '/fixtures/tina-rolf-269345-unsplash.jpg',
           }),
-          createDraftAttachment({
+          createAttachment({
             contentType: VIDEO_MP4,
             fileName: 'pixabay-Soap-Bubble-7141.mp4',
             url: '/fixtures/pixabay-Soap-Bubble-7141.mp4',
diff --git a/ts/components/ForwardMessageModal.tsx b/ts/components/ForwardMessageModal.tsx
index c924da6dea..7d59d049cb 100644
--- a/ts/components/ForwardMessageModal.tsx
+++ b/ts/components/ForwardMessageModal.tsx
@@ -16,7 +16,7 @@ import { animated } from '@react-spring/web';
 
 import classNames from 'classnames';
 import { AttachmentList } from './conversation/AttachmentList';
-import type { AttachmentDraftType } from '../types/Attachment';
+import type { AttachmentType } from '../types/Attachment';
 import { Button } from './Button';
 import type { InputApi } from './CompositionInput';
 import { CompositionInput } from './CompositionInput';
@@ -39,12 +39,12 @@ import { filterAndSortConversationsByRecent } from '../util/filterAndSortConvers
 import { useAnimated } from '../hooks/useAnimated';
 
 export type DataPropsType = {
-  attachments?: Array<AttachmentDraftType>;
+  attachments?: Array<AttachmentType>;
   candidateConversations: ReadonlyArray<ConversationType>;
   doForwardMessage: (
     selectedContacts: Array<string>,
     messageBody?: string,
-    attachments?: Array<AttachmentDraftType>,
+    attachments?: Array<AttachmentType>,
     linkPreview?: LinkPreviewType
   ) => void;
   getPreferredBadge: PreferredBadgeSelectorType;
@@ -102,7 +102,7 @@ export const ForwardMessageModal: FunctionComponent<PropsType> = ({
     filterAndSortConversationsByRecent(candidateConversations, '')
   );
   const [attachmentsToForward, setAttachmentsToForward] = useState<
-    Array<AttachmentDraftType>
+    Array<AttachmentType>
   >(attachments || []);
   const [isEditingMessage, setIsEditingMessage] = useState(false);
   const [messageBodyText, setMessageBodyText] = useState(messageBody || '');
@@ -325,7 +325,7 @@ export const ForwardMessageModal: FunctionComponent<PropsType> = ({
                 <AttachmentList
                   attachments={attachmentsToForward}
                   i18n={i18n}
-                  onCloseAttachment={(attachment: AttachmentDraftType) => {
+                  onCloseAttachment={(attachment: AttachmentType) => {
                     const newAttachments = attachmentsToForward.filter(
                       currentAttachment => currentAttachment !== attachment
                     );
diff --git a/ts/components/conversation/AttachmentList.stories.tsx b/ts/components/conversation/AttachmentList.stories.tsx
index ef4692969e..25464fda46 100644
--- a/ts/components/conversation/AttachmentList.stories.tsx
+++ b/ts/components/conversation/AttachmentList.stories.tsx
@@ -6,6 +6,7 @@ import * as React from 'react';
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 
+import type { AttachmentDraftType } from '../../types/Attachment';
 import type { Props } from './AttachmentList';
 import { AttachmentList } from './AttachmentList';
 import {
@@ -24,7 +25,9 @@ const i18n = setupI18n('en', enMessages);
 
 const story = storiesOf('Components/Conversation/AttachmentList', module);
 
-const createProps = (overrideProps: Partial<Props> = {}): Props => ({
+const createProps = (
+  overrideProps: Partial<Props<AttachmentDraftType>> = {}
+): Props<AttachmentDraftType> => ({
   attachments: overrideProps.attachments || [],
   i18n,
   onAddAttachment: action('onAddAttachment'),
diff --git a/ts/components/conversation/AttachmentList.tsx b/ts/components/conversation/AttachmentList.tsx
index ac6006b97f..a39d399e58 100644
--- a/ts/components/conversation/AttachmentList.tsx
+++ b/ts/components/conversation/AttachmentList.tsx
@@ -7,7 +7,10 @@ import { Image } from './Image';
 import { StagedGenericAttachment } from './StagedGenericAttachment';
 import { StagedPlaceholderAttachment } from './StagedPlaceholderAttachment';
 import type { LocalizerType } from '../../types/Util';
-import type { AttachmentDraftType } from '../../types/Attachment';
+import type {
+  AttachmentType,
+  AttachmentDraftType,
+} from '../../types/Attachment';
 import {
   areAllAttachmentsVisual,
   canDisplayImage,
@@ -15,14 +18,14 @@ import {
   isVideoAttachment,
 } from '../../types/Attachment';
 
-export type Props = Readonly<{
-  attachments: ReadonlyArray<AttachmentDraftType>;
+export type Props<T extends AttachmentType | AttachmentDraftType> = Readonly<{
+  attachments: ReadonlyArray<T>;
   canEditImages?: boolean;
   i18n: LocalizerType;
   onAddAttachment?: () => void;
-  onClickAttachment?: (attachment: AttachmentDraftType) => void;
+  onClickAttachment?: (attachment: T) => void;
   onClose?: () => void;
-  onCloseAttachment: (attachment: AttachmentDraftType) => void;
+  onCloseAttachment: (attachment: T) => void;
 }>;
 
 const IMAGE_WIDTH = 120;
@@ -32,15 +35,21 @@ const IMAGE_HEIGHT = 120;
 const BLANK_VIDEO_THUMBNAIL =
   'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQAAAAA3bvkkAAAACklEQVR42mNiAAAABgADm78GJQAAAABJRU5ErkJggg==';
 
-function getUrl(attachment: AttachmentDraftType): string | undefined {
+function getUrl(
+  attachment: AttachmentType | AttachmentDraftType
+): string | undefined {
   if (attachment.pending) {
     return undefined;
   }
 
+  if ('screenshot' in attachment) {
+    return attachment.screenshot?.url || attachment.url;
+  }
+
   return attachment.url;
 }
 
-export const AttachmentList = ({
+export const AttachmentList = <T extends AttachmentType | AttachmentDraftType>({
   attachments,
   canEditImages,
   i18n,
@@ -48,7 +57,7 @@ export const AttachmentList = ({
   onClickAttachment,
   onCloseAttachment,
   onClose,
-}: Props): JSX.Element | null => {
+}: Props<T>): JSX.Element | null => {
   if (!attachments.length) {
     return null;
   }
diff --git a/ts/state/smart/ForwardMessageModal.tsx b/ts/state/smart/ForwardMessageModal.tsx
index c3525ff5b1..62558b5208 100644
--- a/ts/state/smart/ForwardMessageModal.tsx
+++ b/ts/state/smart/ForwardMessageModal.tsx
@@ -14,14 +14,14 @@ import { getLinkPreview } from '../selectors/linkPreviews';
 import { getIntl, getTheme } from '../selectors/user';
 import { getEmojiSkinTone } from '../selectors/items';
 import { selectRecentEmojis } from '../selectors/emojis';
-import type { AttachmentDraftType } from '../../types/Attachment';
+import type { AttachmentType } from '../../types/Attachment';
 
 export type SmartForwardMessageModalProps = {
-  attachments?: Array<AttachmentDraftType>;
+  attachments?: Array<AttachmentType>;
   doForwardMessage: (
     selectedContacts: Array<string>,
     messageBody?: string,
-    attachments?: Array<AttachmentDraftType>,
+    attachments?: Array<AttachmentType>,
     linkPreview?: LinkPreviewType
   ) => void;
   isSticker: boolean;
diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
index 7b67dc8b44..06bfc2805a 100644
--- a/ts/views/conversation_view.ts
+++ b/ts/views/conversation_view.ts
@@ -7,7 +7,7 @@ import { batch as batchDispatch } from 'react-redux';
 import { debounce, flatten, omit, throttle } from 'lodash';
 import { render } from 'mustache';
 
-import type { AttachmentDraftType, AttachmentType } from '../types/Attachment';
+import type { AttachmentType } from '../types/Attachment';
 import { isGIF } from '../types/Attachment';
 import * as Attachment from '../types/Attachment';
 import type { StickerPackType as StickerPackDBType } from '../sql/Interface';
@@ -1265,31 +1265,16 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     }
 
     const attachments = getAttachmentsForMessage(message.attributes);
-    const draftAttachments = attachments
-      .map((item: AttachmentType): AttachmentDraftType | null => {
-        const { path } = item;
-        if (!path) {
-          return null;
-        }
-
-        return {
-          ...item,
-          path,
-          pending: false as const,
-          screenshotPath: item.screenshot?.path,
-        };
-      })
-      .filter(isNotNil);
 
     this.forwardMessageModal = new Whisper.ReactWrapperView({
       JSX: window.Signal.State.Roots.createForwardMessageModal(
         window.reduxStore,
         {
-          attachments: draftAttachments,
+          attachments,
           doForwardMessage: async (
             conversationIds: Array<string>,
             messageBody?: string,
-            includedAttachments?: Array<AttachmentDraftType>,
+            includedAttachments?: Array<AttachmentType>,
             linkPreview?: LinkPreviewType
           ) => {
             try {
@@ -1338,7 +1323,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     message: MessageModel,
     conversationIds: Array<string>,
     messageBody?: string,
-    attachments?: Array<AttachmentDraftType>,
+    attachments?: Array<AttachmentType>,
     linkPreview?: LinkPreviewType
   ): Promise<boolean> {
     log.info(`maybeForwardMessage/${message.idForLogging()}: Starting...`);