diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
index 01ce71b2e..9e649b77a 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
@@ -118,6 +118,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 - (void)shareTextAction;
 - (void)saveMediaAction;
 - (void)copyMediaAction;
+- (void)deleteAction;
 
 // #pragma mark - UIMenuController
 //
@@ -128,7 +129,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 //- (BOOL)canPerformAction:(SEL)action;
 
 
-//- (void)deleteAction;
 //
 //- (SEL)replyActionSelector;
 //- (SEL)metadataActionSelector;
diff --git a/Signal/src/ViewControllers/MessageActionsViewController.swift b/Signal/src/ViewControllers/MessageActionsViewController.swift
index 09a9bca9a..49c499c2e 100644
--- a/Signal/src/ViewControllers/MessageActionsViewController.swift
+++ b/Signal/src/ViewControllers/MessageActionsViewController.swift
@@ -39,18 +39,18 @@ struct MessageActionBuilder {
                                 delegate?.messageActionsShowDetailsForItem(conversationViewItem)
         })
     }
-}
-
-extension ConversationViewItem {
 
-    var deleteMessageAction: MessageAction {
+    static func deleteMessage(conversationViewItem: ConversationViewItem, delegate: MessageActionsDelegate) -> MessageAction {
         return MessageAction(image: #imageLiteral(resourceName: "message_status_failed_large"),
                              title: NSLocalizedString("MESSAGE_ACTION_DELETE_MESSAGE", comment: "Action sheet button title"),
                              subtitle: NSLocalizedString("MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE", comment: "Action sheet button subtitle"),
-                             block: { (action) in
-                                Logger.debug("\(self.logTag) in \(#function) action: \(action)")
+                             block: { (_) in
+                                conversationViewItem.deleteAction()
         })
     }
+}
+
+extension ConversationViewItem {
 
     @objc
     func textActions(delegate: MessageActionsDelegate) -> [MessageAction] {
@@ -64,32 +64,13 @@ extension ConversationViewItem {
             actions.append(copyTextAction)
         }
 
+        let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: self, delegate: delegate)
+        actions.append(deleteAction)
+
         let showInfoAction = MessageActionBuilder.showDetails(conversationViewItem: self, delegate: delegate)
         actions.append(showInfoAction)
 
         return actions
-//        switch self.messageCellType() {
-//        case .unknown:
-//            return actions
-//        case .textMessage:
-//            return [self.copyTextAction]
-//        case .oversizeTextMessage:
-//            return [self.copyTextAction]
-//        case .stillImage:
-//            return []
-//        case .animatedImage:
-//            return []
-//        case .audio:
-//            return []
-//        case .video:
-//            return []
-//        case .genericAttachment:
-//            return []
-//        case .downloadingAttachment:
-//            return []
-//        case .contactShare:
-//            return []
-//        }
     }
 }