diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index ff908f43f..90807940f 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -567,8 +567,13 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
             return
         }
         
-        if viewItem.interaction.interactionType() == .outgoingMessage,
-           let message = viewItem.interaction as? TSMessage, message.serverHash != nil  {
+        guard let message = viewItem.interaction as? TSMessage else { return self.deleteLocally(viewItem) }
+        
+        // Handle open group messages the old way
+        if message.isOpenGroupMessage { return self.deleteForEveryone(viewItem) }
+        
+        // Handle 1-1 and closed group messages with unsend request
+        if viewItem.interaction.interactionType() == .outgoingMessage, message.serverHash != nil  {
             let alertVC = UIAlertController.init(title: nil, message: nil, preferredStyle: .actionSheet)
             let deleteLocallyAction = UIAlertAction.init(title: NSLocalizedString("delete_message_for_me", comment: ""), style: .destructive) { _ in
                 self.deleteLocally(viewItem)
diff --git a/Session/Media Viewing & Editing/MediaPageViewController.swift b/Session/Media Viewing & Editing/MediaPageViewController.swift
index 6036e8044..9301d4f57 100644
--- a/Session/Media Viewing & Editing/MediaPageViewController.swift	
+++ b/Session/Media Viewing & Editing/MediaPageViewController.swift	
@@ -406,7 +406,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
         }
 
         let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-        let deleteAction = UIAlertAction(title: NSLocalizedString("TXT_DELETE_TITLE", comment: ""),
+        let deleteAction = UIAlertAction(title: NSLocalizedString("delete_message_for_me", comment: ""),
                                          style: .destructive) { _ in
                                             let deletedItem = currentViewController.galleryItem
                                             mediaGalleryDataSource.delete(items: [deletedItem], initiatedBy: self)