diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt
index 689a0edee5c..28036ecdc70 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt
@@ -43,7 +43,7 @@ import com.infomaniak.mail.ui.main.folderPicker.FolderPickerFragmentArgs
 import com.infomaniak.mail.ui.main.thread.PrintMailFragmentArgs
 import com.infomaniak.mail.ui.main.thread.ThreadFragment.Companion.OPEN_REACTION_BOTTOM_SHEET
 import com.infomaniak.mail.ui.main.thread.actions.ThreadActionsBottomSheetDialog.Companion.setBlockUserUi
-import com.infomaniak.mail.ui.main.thread.actions.ThreadActionsBottomSheetDialog.Companion.setSpamPhishingUi
+import com.infomaniak.mail.ui.main.thread.actions.ThreadActionsBottomSheetDialog.Companion.setSpamUi
 import com.infomaniak.mail.utils.FolderRoleUtils
 import com.infomaniak.mail.utils.extensions.animatedNavigation
 import com.infomaniak.mail.utils.extensions.archiveWithConfirmationPopup
@@ -96,7 +96,7 @@ class MessageActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
             setArchiveUi(isFromArchive = folderRole == FolderRole.ARCHIVE)
             setFavoriteUi(message.isFavorite)
             setReactionUi(message.isValidReactionTarget)
-            setSpamPhishingUi(binding.spam, binding.phishing, isFromSpam)
+            setSpamUi(binding.spam, isFromSpam)
 
             observeReportPhishingResult()
             observePotentialBlockedSenders()
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MultiSelectBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MultiSelectBottomSheetDialog.kt
index dc8d29ca007..83674d7f648 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MultiSelectBottomSheetDialog.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MultiSelectBottomSheetDialog.kt
@@ -157,6 +157,8 @@ class MultiSelectBottomSheetDialog : ActionsBottomSheetDialog() {
                 description = resources.getQuantityString(R.plurals.reportPhishingDescription, messages.count()),
                 onPositiveButtonClicked = { mainViewModel.reportPhishing(threadsUids, messages) },
             )
+
+            isMultiSelectOn = false
         }
 
         binding.blockSender.setClosingOnClickListener {
@@ -178,7 +180,7 @@ class MultiSelectBottomSheetDialog : ActionsBottomSheetDialog() {
                     junkMessagesViewModel.messageOfUserToBlock.value = message
                 }
             }
-            mainViewModel.isMultiSelectOn = false
+            isMultiSelectOn = false
         }
 
         binding.favorite.setClosingOnClickListener(shouldCloseMultiSelection = true) {
@@ -281,9 +283,8 @@ class MultiSelectBottomSheetDialog : ActionsBottomSheetDialog() {
         }
 
         setSnoozeUi(threads)
-        ThreadActionsBottomSheetDialog.setSpamPhishingUi(
+        ThreadActionsBottomSheetDialog.setSpamUi(
             spam = binding.spam,
-            phishing = binding.phishing,
             isFromSpam = mainViewModel.currentFolder.value?.role == FolderRole.SPAM
         )
         hideFirstActionItemDivider()
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ThreadActionsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ThreadActionsBottomSheetDialog.kt
index f0de8a2c661..b16df01d8a7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ThreadActionsBottomSheetDialog.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ThreadActionsBottomSheetDialog.kt
@@ -109,7 +109,7 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
                 setFavoriteUi(thread.isFavorite)
                 setSnoozeUi(thread.isSnoozed())
                 setReactionUi(canBeReactedTo = messageUidToReactTo != null)
-                setSpamPhishingUi(binding.spam, binding.phishing, isFromSpam)
+                setSpamUi(binding.spam, isFromSpam)
 
                 initOnClickListener(onActionClick(thread, messageUidToExecuteAction, messageUidToReactTo))
             }
@@ -263,6 +263,8 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
                 description = resources.getQuantityString(R.plurals.reportPhishingDescription, thread.messages.count()),
                 onPositiveButtonClicked = { mainViewModel.reportPhishing(junkMessagesViewModel.threadsUids, junkMessages) },
             )
+
+            mainViewModel.isMultiSelectOn = false
         }
 
         override fun onBlockSender() {
@@ -321,7 +323,7 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
         const val TAG = "ThreadActionsBottomSheetDialog"
         const val OPEN_SNOOZE_BOTTOM_SHEET = "openSnoozeBottomSheet"
 
-        fun setSpamPhishingUi(spam: ActionItemView, phishing: ActionItemView, isFromSpam: Boolean) {
+        fun setSpamUi(spam: ActionItemView, isFromSpam: Boolean) {
             spam.apply {
                 val (text, icon) = if (isFromSpam) {
                     R.string.actionNonSpam to R.drawable.ic_non_spam
@@ -333,8 +335,6 @@ class ThreadActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
                 setIconResource(icon)
                 isVisible = true
             }
-
-            phishing.isVisible = !isFromSpam
         }
 
         fun setBlockUserUi(blockSender: ActionItemView, potentialUsersToBlock: Map<Recipient, Message>, isFromSpam: Boolean) {