diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index bc537bd063..483a445ead 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -2056,48 +2056,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     // Note: The messages in the provided set may be a single message, or multiple if there are a
     // group of selected messages.
     override fun deleteMessages(messages: Set<MessageRecord>) {
-        endActionMode()
-
         viewModel.handleMessagesDeletion(messages)
-
-/*
-        // If the recipient is a community OR a Note-to-Self then we delete the message for everyone
-        if (recipient.isCommunityRecipient || recipient.isLocalNumber) {
-            showSessionDialog {
-                title(resources.getQuantityString(R.plurals.deleteMessage, messages.count(), messages.count()))
-                text(resources.getString(R.string.deleteMessageDescriptionEveryone))
-                dangerButton(R.string.delete) { messages.forEach(viewModel::deleteForEveryone); endActionMode() }
-                cancelButton { endActionMode() }
-            }
-        // Otherwise if this is a 1-on-1 conversation we may decided to delete just for ourselves or delete for everyone
-        } else if (allSentByCurrentUser && allHasHash) {
-            val bottomSheet = DeleteOptionsBottomSheet()
-            bottomSheet.recipient = recipient
-            bottomSheet.onDeleteForMeTapped = {
-                messages.forEach(viewModel::deleteLocally)
-                bottomSheet.dismiss()
-                endActionMode()
-            }
-            bottomSheet.onDeleteForEveryoneTapped = {
-                messages.forEach(viewModel::deleteForEveryone)
-                bottomSheet.dismiss()
-                endActionMode()
-            }
-            bottomSheet.onCancelTapped = {
-                bottomSheet.dismiss()
-                endActionMode()
-            }
-            bottomSheet.show(supportFragmentManager, bottomSheet.tag)
-        }
-        else // Finally, if this is a closed group and you are deleting someone else's message(s) then we can only delete locally.
-        {
-            showSessionDialog {
-                title(resources.getQuantityString(R.plurals.deleteMessage, messages.count(), messages.count()))
-                text(resources.getString(R.string.deleteMessageDescriptionDevice))
-                dangerButton(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
-                cancelButton(::endActionMode)
-            }
-        }*/
+        endActionMode()
     }
 
     override fun banUser(messages: Set<MessageRecord>) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
index 3a9762f160..5c240445ca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@@ -257,10 +257,10 @@ class ConversationViewModel(
                 conversationType == MessageType.NOTE_TO_SELF -> {
                     _dialogsState.update {
                         it.copy(deleteAllDevices = DeleteForEveryoneDialogData(
-                            messages = messages,
-                            defaultToEveryone = false,
-                            messageType = DeleteForEveryoneMessageType.NoteToSelf
-                        )
+                                    messages = messages,
+                                    defaultToEveryone = false,
+                                    messageType = DeleteForEveryoneMessageType.NoteToSelf
+                                )
                         )
                     }
                 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index 21d5de52cf..29956e3db9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -10,6 +10,7 @@ import org.session.libsession.messaging.utilities.AccountId
 import org.session.libsession.messaging.utilities.SodiumUtilities
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.IdPrefix
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.conversation.v2.ConversationAdapter
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
 import org.thoughtcrime.securesms.database.model.MessageRecord
@@ -92,7 +93,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
     }
 
     override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-        val selectedItems = adapter.selectedItems
+        val selectedItems = adapter.selectedItems.toSet()
         when (item.itemId) {
             R.id.menu_context_delete_message -> delegate?.deleteMessages(selectedItems)
             R.id.menu_context_ban_user -> delegate?.banUser(selectedItems)