diff --git a/CHANGELOG.md b/CHANGELOG.md
index 827c282aae..2c99e83375 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -170,6 +170,7 @@ Also make opening devtools with F12 more reliable.
 - Show thumbnail in chatlist summary of image, sticker and webxdc messages
 - add webxdc api `sendToChat` #3240
 - add webxdc api `importFiles`
+- add context menu option to delete media-messages from gallery
 
 ### Changed
 - exclude more unused files from installation package
diff --git a/scss/gallery/_media-attachment.scss b/scss/gallery/_media-attachment.scss
index ff8706de2e..b01e03e598 100644
--- a/scss/gallery/_media-attachment.scss
+++ b/scss/gallery/_media-attachment.scss
@@ -71,6 +71,12 @@
       color: grey;
     }
   }
+
+  &.broken {
+    .name {
+      color: var(--colorDanger);
+    }
+  }
 }
 
 .media-attachment-generic {
@@ -145,6 +151,16 @@
       margin-top: 3px;
     }
   }
+
+  &.broken {
+    & > .file-icon {
+      cursor: unset;
+    }
+    .name,
+    .file-extension {
+      color: var(--colorDanger);
+    }
+  }
 }
 
 .media-attachment-webxdc {
@@ -195,4 +211,13 @@
       word-break: break-all;
     }
   }
+
+  &.broken {
+    & > .icon {
+      background-color: var(--colorDanger);
+    }
+    .name {
+      color: var(--colorDanger);
+    }
+  }
 }
diff --git a/src/renderer/components/Gallery.tsx b/src/renderer/components/Gallery.tsx
index e0e95d216a..20b5c3fa06 100644
--- a/src/renderer/components/Gallery.tsx
+++ b/src/renderer/components/Gallery.tsx
@@ -1,6 +1,13 @@
 import React, { Component } from 'react'
 import { ScreenContext } from '../contexts'
-import MediaAttachment from './attachment/mediaAttachment'
+import {
+  AudioAttachment,
+  FileAttachment,
+  GalleryAttachmentElementProps,
+  ImageAttachment,
+  VideoAttachment,
+  WebxdcAttachment,
+} from './attachment/mediaAttachment'
 import { getLogger } from '../../shared/logger'
 import { BackendRemote, Type } from '../backend-com'
 import { selectedAccountId } from '../ScreenController'
@@ -11,23 +18,31 @@ type MediaTabKey = 'images' | 'video' | 'audio' | 'files' | 'webxdc_apps'
 
 const MediaTabs: Readonly<
   {
-    [key in MediaTabKey]: { values: Type.Viewtype[] }
+    [key in MediaTabKey]: {
+      values: Type.Viewtype[]
+      element: (props: GalleryAttachmentElementProps) => JSX.Element
+    }
   }
 > = {
   images: {
     values: ['Gif', 'Image'],
+    element: ImageAttachment,
   },
   video: {
     values: ['Video'],
+    element: VideoAttachment,
   },
   audio: {
     values: ['Audio', 'Voice'],
+    element: AudioAttachment,
   },
   files: {
     values: ['File'],
+    element: FileAttachment,
   },
   webxdc_apps: {
     values: ['Webxdc'],
+    element: WebxdcAttachment,
   },
 }
 
@@ -38,8 +53,9 @@ export default class Gallery extends Component<
   {
     id: MediaTabKey
     msgTypes: Type.Viewtype[]
-    medias: Type.Message[]
-    errors: { msgId: number; error: string }[]
+    element: (props: GalleryAttachmentElementProps) => JSX.Element
+    mediaMessageIds: number[]
+    mediaLoadResult: Record<number, Type.MessageLoadResult>
   }
 > {
   constructor(props: mediaProps) {
@@ -47,8 +63,9 @@ export default class Gallery extends Component<
     this.state = {
       id: 'images',
       msgTypes: MediaTabs.images.values,
-      medias: [],
-      errors: [],
+      element: ImageAttachment,
+      mediaMessageIds: [],
+      mediaLoadResult: {},
     }
   }
 
@@ -67,29 +84,25 @@ export default class Gallery extends Component<
       throw new Error('chat id missing')
     }
     const msgTypes = MediaTabs[id].values
+    const newElement = MediaTabs[id].element
     const accountId = selectedAccountId()
     const chatId = this.props.chatId !== 'all' ? this.props.chatId : null
 
     BackendRemote.rpc
       .getChatMedia(accountId, chatId, msgTypes[0], msgTypes[1], null)
       .then(async media_ids => {
-        // throws if some media is not found
-        const all_media_fetch_results = await BackendRemote.rpc.getMessages(
+        const mediaLoadResult = await BackendRemote.rpc.getMessages(
           accountId,
           media_ids
         )
-        const medias: Type.Message[] = []
-        const errors = []
-        for (const msgId of media_ids) {
-          const result = all_media_fetch_results[msgId]
-          if (result.variant === 'message') {
-            medias.push(result)
-          } else {
-            errors.push({ msgId, error: result.error })
-          }
-        }
-        log.errorWithoutStackTrace('messages failed to load:', errors)
-        this.setState({ id, msgTypes, medias, errors })
+        media_ids.reverse() // order newest up - if we need different ordering we need to do it in core
+        this.setState({
+          id,
+          msgTypes,
+          element: newElement,
+          mediaMessageIds: media_ids,
+          mediaLoadResult,
+        })
         this.forceUpdate()
       })
       .catch(log.error.bind(log))
@@ -113,7 +126,7 @@ export default class Gallery extends Component<
   }
 
   render() {
-    const { medias, id, errors } = this.state
+    const { mediaMessageIds, mediaLoadResult, id } = this.state
     const tx = window.static_translate // static because dynamic isn't too important here
     const emptyTabMessage = this.emptyTabMessage(id)
 
@@ -138,39 +151,20 @@ export default class Gallery extends Component<
           </ul>
           <div className='bp4-tab-panel' role='tabpanel'>
             <div className='gallery'>
-              {errors.length > 0 && (
-                <div className='loading-errors'>
-                  The following messages failed to load, please report these
-                  errors to the developers:
-                  <ul>
-                    {errors.map(error => (
-                      <li key={error.msgId}>
-                        {error.msgId} {'->'} {error.error}
-                      </li>
-                    ))}
-                  </ul>
-                </div>
-              )}
-              <div
-                className='item-container'
-                style={{
-                  justifyContent: medias.length < 1 ? 'center' : undefined,
-                }}
-              >
-                {medias.length < 1 ? (
+              <div className='item-container'>
+                {mediaMessageIds.length < 1 ? (
                   <p className='no-media-message'>{emptyTabMessage}</p>
                 ) : (
                   ''
                 )}
-                {medias
-                  .sort((a, b) => b.sortTimestamp - a.sortTimestamp)
-                  .map(message => {
-                    return (
-                      <div className='item' key={message.id}>
-                        <MediaAttachment message={message} />
-                      </div>
-                    )
-                  })}
+                {mediaMessageIds.map(msgId => {
+                  const message = mediaLoadResult[msgId]
+                  return (
+                    <div className='item' key={msgId}>
+                      <this.state.element msgId={msgId} load_result={message} />
+                    </div>
+                  )
+                })}
               </div>
             </div>
           </div>
diff --git a/src/renderer/components/attachment/mediaAttachment.tsx b/src/renderer/components/attachment/mediaAttachment.tsx
index 0ff79ec172..6b49647e13 100644
--- a/src/renderer/components/attachment/mediaAttachment.tsx
+++ b/src/renderer/components/attachment/mediaAttachment.tsx
@@ -3,8 +3,9 @@ import {
   openAttachmentInShell,
   onDownload,
   openWebxdc,
+  confirmDeleteMessage,
 } from '../message/messageFunctions'
-import { ScreenContext } from '../../contexts'
+import { ScreenContext, unwrapContext } from '../../contexts'
 import {
   isImage,
   isVideo,
@@ -18,39 +19,15 @@ import { OpenDialogFunctionType } from '../dialogs/DialogController'
 import { runtime } from '../../runtime'
 
 import filesizeConverter from 'filesize'
-import { jumpToMessage } from '../helpers/ChatMethods'
+import { deleteMessage, jumpToMessage } from '../helpers/ChatMethods'
 import { getLogger } from '../../../shared/logger'
 import { truncateText } from '../../../shared/util'
 import { Type } from '../../backend-com'
 import { selectedAccountId } from '../../ScreenController'
+import ConfirmationDialog from '../dialogs/ConfirmationDialog'
 
 const log = getLogger('mediaAttachment')
 
-export default function MediaAttachment({
-  message,
-}: {
-  message: Type.Message
-}) {
-  if (!message.file) {
-    return null
-  }
-  switch (message.viewType) {
-    case 'Gif':
-    case 'Image':
-      return <ImageAttachment message={message} />
-    case 'Video':
-      return <VideoAttachment message={message} />
-    case 'Audio':
-    case 'Voice':
-      return <AudioAttachment message={message} />
-    case 'Webxdc':
-      return <WebxdcAttachment message={message} />
-    case 'File':
-    default:
-      return <FileAttachment message={message} />
-  }
-}
-
 const hideOpenInShellTypes: Type.Viewtype[] = [
   'Gif',
   'Image',
@@ -94,12 +71,23 @@ const contextMenuFactory = (
       label: tx('menu_message_details'),
       action: openDialog.bind(null, 'MessageDetail', { id: msgId }),
     },
+    {
+      label: tx('delete'),
+      action: () =>
+        openDialog(ConfirmationDialog, {
+          message: tx('ask_delete_message'),
+          confirmLabel: tx('delete'),
+          cb: (yes: boolean) => yes && deleteMessage(msgId),
+        }),
+    },
   ]
 }
 
 /** provides a quick link to comonly used functions to save a few duplicated lines  */
-const useMediaActions = (message: Type.Message) => {
-  const { openDialog, openContextMenu } = useContext(ScreenContext)
+const getMediaActions = (
+  { openDialog, openContextMenu }: unwrapContext<typeof ScreenContext>,
+  message: Type.Message
+) => {
   return {
     openContextMenu: makeContextMenu(
       contextMenuFactory.bind(null, message, openDialog),
@@ -113,6 +101,27 @@ const useMediaActions = (message: Type.Message) => {
   }
 }
 
+function getBrokenMediaContextMenu(
+  { openContextMenu, openDialog }: unwrapContext<typeof ScreenContext>,
+  msgId: number
+) {
+  const tx = window.static_translate
+  return makeContextMenu(
+    [
+      {
+        label: tx('delete'),
+        action: () =>
+          openDialog(ConfirmationDialog, {
+            message: tx('ask_delete_message'),
+            confirmLabel: tx('delete'),
+            cb: (yes: boolean) => yes && deleteMessage(msgId),
+          }),
+      },
+    ],
+    openContextMenu
+  )
+}
+
 function squareBrokenMediaContent(
   hasSupportedFormat: boolean,
   contentType: string | null
@@ -127,159 +136,310 @@ function squareBrokenMediaContent(
   )
 }
 
-function ImageAttachment({ message }: { message: Type.Message }) {
-  const { openContextMenu, openFullscreenMedia, openInShell } = useMediaActions(
-    message
-  )
-  const { file, fileMime } = message
-  const hasSupportedFormat = isImage(fileMime || '')
-  const isBroken = !file || !hasSupportedFormat
-  return (
-    <div
-      className={`media-attachment-media${isBroken ? ` broken` : ''}`}
-      onClick={isBroken ? openInShell : openFullscreenMedia}
-      onContextMenu={openContextMenu}
-    >
-      {isBroken ? (
-        squareBrokenMediaContent(hasSupportedFormat, fileMime || '')
-      ) : (
-        <img
-          className='attachment-content'
-          src={runtime.transformBlobURL(file)}
-        />
-      )}
-    </div>
-  )
+export type GalleryAttachmentElementProps = {
+  msgId: number
+  load_result: Type.MessageLoadResult
 }
 
-function VideoAttachment({ message }: { message: Type.Message }) {
-  const { openContextMenu, openFullscreenMedia, openInShell } = useMediaActions(
-    message
-  )
-  const { fileMime, file } = message
-  const hasSupportedFormat = isVideo(fileMime)
-  const isBroken = !file || !hasSupportedFormat
-  return (
-    <div
-      className={`media-attachment-media${isBroken ? ` broken` : ''}`}
-      onClick={isBroken ? openInShell : openFullscreenMedia}
-      onContextMenu={openContextMenu}
-    >
-      {isBroken ? (
-        squareBrokenMediaContent(hasSupportedFormat, fileMime)
-      ) : (
-        <>
-          <video
+export function ImageAttachment({
+  msgId,
+  load_result,
+}: GalleryAttachmentElementProps) {
+  const screenContext = useContext(ScreenContext)
+  const tx = window.static_translate
+
+  if (load_result.variant === 'loadingError') {
+    const onContextMenu = getBrokenMediaContextMenu(screenContext, msgId)
+    return (
+      <div
+        className={'media-attachment-media broken'}
+        title={load_result.error}
+        onContextMenu={onContextMenu}
+      >
+        <div className='attachment-content'>
+          {tx('attachment_failed_to_load')}
+        </div>
+      </div>
+    )
+  } else {
+    const message = load_result
+    const {
+      openContextMenu,
+      openFullscreenMedia,
+      openInShell,
+    } = getMediaActions(screenContext, message)
+    const { file, fileMime } = message
+    const hasSupportedFormat = isImage(fileMime)
+    const isBroken = !file || !hasSupportedFormat
+    return (
+      <div
+        className={`media-attachment-media${isBroken ? ` broken` : ''}`}
+        onClick={isBroken ? openInShell : openFullscreenMedia}
+        onContextMenu={openContextMenu}
+      >
+        {isBroken ? (
+          squareBrokenMediaContent(hasSupportedFormat, fileMime)
+        ) : (
+          <img
             className='attachment-content'
             src={runtime.transformBlobURL(file)}
-            controls={false}
           />
-          <div className='video-play-btn'>
-            <div className='video-play-btn-icon' />
-          </div>
-        </>
-      )}
-    </div>
-  )
+        )}
+      </div>
+    )
+  }
 }
 
-function AudioAttachment({ message }: { message: Type.Message }) {
-  const { openContextMenu } = useMediaActions(message)
-  const { fileMime, file } = message
-  const hasSupportedFormat = isAudio(fileMime)
-  return (
-    <div className='media-attachment-audio' onContextMenu={openContextMenu}>
-      <div className='heading'>
-        <div className='name'>{message?.sender.displayName}</div>
-        <Timestamp
-          timestamp={message?.timestamp * 1000}
-          extended
-          module='date'
-        />
-      </div>
-      {hasSupportedFormat ? (
-        <audio controls>
-          <source src={runtime.transformBlobURL(file || '')} />
-        </audio>
-      ) : (
-        <div>
-          {window.static_translate(
-            'cannot_display_unsuported_file_type',
-            fileMime || 'null'
-          )}
+export function VideoAttachment({
+  msgId,
+  load_result,
+}: GalleryAttachmentElementProps) {
+  const screenContext = useContext(ScreenContext)
+  const tx = window.static_translate
+
+  if (load_result.variant === 'loadingError') {
+    const onContextMenu = getBrokenMediaContextMenu(screenContext, msgId)
+    return (
+      <div
+        className={'media-attachment-media broken'}
+        title={load_result.error}
+        onContextMenu={onContextMenu}
+      >
+        <div className='attachment-content'>
+          {tx('attachment_failed_to_load')}
         </div>
-      )}
-    </div>
-  )
+      </div>
+    )
+  } else {
+    const message = load_result
+    const {
+      openContextMenu,
+      openFullscreenMedia,
+      openInShell,
+    } = getMediaActions(screenContext, message)
+    const { file, fileMime } = message
+    const hasSupportedFormat = isVideo(fileMime)
+    const isBroken = !file || !hasSupportedFormat
+    return (
+      <div
+        className={`media-attachment-media${isBroken ? ` broken` : ''}`}
+        onClick={isBroken ? openInShell : openFullscreenMedia}
+        onContextMenu={openContextMenu}
+      >
+        {isBroken ? (
+          squareBrokenMediaContent(hasSupportedFormat, fileMime || '')
+        ) : (
+          <>
+            <video
+              className='attachment-content'
+              src={runtime.transformBlobURL(file)}
+              controls={false}
+            />
+            <div className='video-play-btn'>
+              <div className='video-play-btn-icon' />
+            </div>
+          </>
+        )}
+      </div>
+    )
+  }
 }
 
-function FileAttachment({ message }: { message: Type.Message }) {
-  const { openContextMenu, openInShell } = useMediaActions(message)
-  const { fileName, fileBytes, fileMime, file } = message
-  const extension = getExtension(message)
-  return (
-    <div
-      className='media-attachment-generic'
-      role='button'
-      onClick={ev => {
-        ev.stopPropagation()
-        openInShell()
-      }}
-      onContextMenu={openContextMenu}
-    >
+export function AudioAttachment({
+  msgId,
+  load_result,
+}: GalleryAttachmentElementProps) {
+  const screenContext = useContext(ScreenContext)
+  const tx = window.static_translate
+
+  if (load_result.variant === 'loadingError') {
+    const onContextMenu = getBrokenMediaContextMenu(screenContext, msgId)
+    return (
       <div
-        className='file-icon'
-        draggable='true'
-        onDragStart={dragAttachmentOut.bind(null, file)}
-        title={fileMime || 'null'}
+        className={'media-attachment-audio broken'}
+        title={load_result.error}
+        onContextMenu={onContextMenu}
       >
-        {extension ? (
-          <div className='file-extension'>
-            {fileMime === 'application/octet-stream' ? '' : extension}
-          </div>
-        ) : null}
+        <div className='heading'>
+          <div className='name'>? Error ?</div>
+          <span className='date'>?</span>
+        </div>
+        <div className='attachment-content'>
+          {tx('attachment_failed_to_load')}
+        </div>
       </div>
-      <div className='text-part'>
-        <div className='name'>{fileName}</div>
-        <div className='size'>
-          {fileBytes ? filesizeConverter(fileBytes) : '?'}
+    )
+  } else {
+    const message = load_result
+    const { openContextMenu } = getMediaActions(screenContext, message)
+    const { file, fileMime } = message
+    const hasSupportedFormat = isAudio(fileMime)
+    const isBroken = !file || !hasSupportedFormat
+    return (
+      <div
+        className={`media-attachment-audio${isBroken ? ` broken` : ''}`}
+        onContextMenu={openContextMenu}
+      >
+        <div className='heading'>
+          <div className='name'>{message?.sender.displayName}</div>
+          <Timestamp
+            timestamp={message?.timestamp * 1000}
+            extended
+            module='date'
+          />
         </div>
+        {hasSupportedFormat ? (
+          <audio controls>
+            <source src={runtime.transformBlobURL(file || '')} />
+          </audio>
+        ) : (
+          <div>
+            {window.static_translate(
+              'cannot_display_unsuported_file_type',
+              fileMime || 'null'
+            )}
+          </div>
+        )}
       </div>
-    </div>
-  )
+    )
+  }
 }
 
-function WebxdcAttachment({ message }: { message: Type.Message }) {
-  const { openContextMenu } = useMediaActions(message)
-
-  if (!message.webxdcInfo) {
-    log.error('message.webxdcInfo is undefined, msgid:', message.id)
-    return FileAttachment({ message })
-  }
+export function FileAttachment({
+  msgId,
+  load_result,
+}: GalleryAttachmentElementProps) {
+  const screenContext = useContext(ScreenContext)
+  const tx = window.static_translate
 
-  const { summary, name, document } = message.webxdcInfo
+  if (load_result.variant === 'loadingError') {
+    const onContextMenu = getBrokenMediaContextMenu(screenContext, msgId)
+    return (
+      <div
+        className={'media-attachment-generic broken'}
+        title={load_result.error}
+        onContextMenu={onContextMenu}
+      >
+        <div className='file-icon'>
+          <div className='file-extension'>?</div>
+        </div>
+        <div className='text-part'>
+          <div className='name'>{tx('attachment_failed_to_load')}</div>
+          <div className='size'>{'?'}</div>
+        </div>
+      </div>
+    )
+  } else {
+    const message = load_result
+    const { openContextMenu, openInShell } = getMediaActions(
+      screenContext,
+      message
+    )
+    const { fileName, fileBytes, fileMime, file } = message
 
-  return (
-    <div
-      className='media-attachment-webxdc'
-      role='button'
-      onContextMenu={openContextMenu}
-      onClick={openWebxdc.bind(null, message.id)}
-    >
-      <img
-        className='icon'
-        src={runtime.getWebxdcIconURL(selectedAccountId(), message.id)}
-      />
-      <div className='text-part'>
+    const extension = getExtension(message)
+    return (
+      <div
+        className='media-attachment-generic'
+        role='button'
+        onClick={ev => {
+          ev.stopPropagation()
+          openInShell()
+        }}
+        onContextMenu={openContextMenu}
+      >
         <div
-          className='name'
-          title={`${document ? document + ' \n' : ''}${name}`}
+          className='file-icon'
+          draggable='true'
+          onDragStart={dragAttachmentOut.bind(null, file)}
+          title={fileMime || 'null'}
         >
-          {document && truncateText(document, 25) + ' - '}
-          {name}
+          {extension ? (
+            <div className='file-extension'>
+              {fileMime === 'application/octet-stream' ? '' : extension}
+            </div>
+          ) : null}
+        </div>
+        <div className='text-part'>
+          <div className='name'>{fileName}</div>
+          <div className='size'>
+            {fileBytes ? filesizeConverter(fileBytes) : '?'}
+          </div>
         </div>
-        <div className='summary'>{summary}</div>
       </div>
-    </div>
-  )
+    )
+  }
+}
+
+export function WebxdcAttachment({
+  msgId,
+  load_result,
+}: GalleryAttachmentElementProps) {
+  const screenContext = useContext(ScreenContext)
+  const tx = window.static_translate
+
+  if (load_result.variant === 'loadingError') {
+    const onContextMenu = getBrokenMediaContextMenu(screenContext, msgId)
+    return (
+      <div
+        className={'media-attachment-webxdc broken'}
+        title={load_result.error}
+        onContextMenu={onContextMenu}
+      >
+        <div className='icon'></div>
+        <div className='text-part'>
+          <div className='name'>{tx('attachment_failed_to_load')}</div>
+          <div className='summary'></div>
+        </div>
+      </div>
+    )
+  } else if (load_result.webxdcInfo == null) {
+    const onContextMenu = getBrokenMediaContextMenu(screenContext, msgId)
+    // webxdc info is not set, show different error
+    log.error('message.webxdcInfo is undefined, msgid:', msgId)
+    return (
+      <div
+        className='media-attachment-webxdc'
+        role='button'
+        onContextMenu={onContextMenu}
+      >
+        <img
+          className='icon'
+          src={runtime.getWebxdcIconURL(selectedAccountId(), msgId)}
+        />
+        <div className='text-part'>
+          <div className='name'>Error loading info</div>
+          <div className='summary'>
+            {'message.webxdcInfo is undefined, msgid:' + msgId}
+          </div>
+        </div>
+      </div>
+    )
+  } else {
+    const { openContextMenu } = getMediaActions(screenContext, load_result)
+    const { summary, name, document } = load_result.webxdcInfo
+    return (
+      <div
+        className='media-attachment-webxdc'
+        role='button'
+        onContextMenu={openContextMenu}
+        onClick={openWebxdc.bind(null, load_result.id)}
+      >
+        <img
+          className='icon'
+          src={runtime.getWebxdcIconURL(selectedAccountId(), load_result.id)}
+        />
+        <div className='text-part'>
+          <div
+            className='name'
+            title={`${document ? document + ' \n' : ''}${name}`}
+          >
+            {document && truncateText(document, 25) + ' - '}
+            {name}
+          </div>
+          <div className='summary'>{summary}</div>
+        </div>
+      </div>
+    )
+  }
 }