From b41b36e579136268a4274f4fdcb23480147a40eb Mon Sep 17 00:00:00 2001
From: Andrea <andrea.piai@pagopa.it>
Date: Tue, 9 Jul 2024 16:12:01 +0200
Subject: [PATCH] feat: [IOCOM-1413] Archiving/Restoring of user messages, new
 Messages Home (#5935)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

⚠️ This PR depends on #5912 ⚠️

## Short description
This PR adds the support for archiving and restoring of user messages,
in the new messages home.

|iOS|Android|
|-|-|
|<video
src="https://github.com/pagopa/io-app/assets/5150343/a5f7a2a9-3c20-4ea6-9f34-ce18f22b7ee9"
/>|<video
src="https://github.com/pagopa/io-app/assets/5150343/025fcc9f-3123-44bf-b45a-b5d4d36cfa4d"
/>|

**_Please note_** that the toast showing "Annullato" has been removed.

## List of changes proposed in this pull request
New archiving/restoring UI and UX. In order to both fix previous
problems and not change a complex business logic, this PR builds above
the latter, keeping the compatibility with the old system (the algorithm
is explained in
`ts/features/messages/saga/handleUpsertMessageStatusAttributes.ts`)

- actions and reducer. The feature is implemented with three states:
- "disabled" | "enabled": the latter displays the bottom CTAs and allows
to select messages for archiving/restoring
- "processing": the system is busy processing the asynchronous
archiving/restoring of messages

Messages are enqueued by Id while in the "enabled" state and processed
one at a time while in "processing" state, in order to properly handle
whatever failure may happen. It also supports cancellation by the user.
If at any moment an error or a cancellation happens, the processing is
suspended, the user is notified but she can later resume it.

- `ArchiveRestoreBar` is the component that displays the bottom CTAs for
archiving/restoring

Since the bottom bar is hidden while picking messages or processing
them, there are some application entry points that have been disabled,
in order not to trigger a flow that may later bring back to another main
screen without the bottom bar. Such flows are deep link following, push
notification tapping, message reloading and next page loading during
processing, first message page loading and message search.

## How to test
Using the io-dev-api-server, make sure to enable both DS and new
messages home. Long tap (and later tap) on some messages and try the
archiving/restoring/cancelling.
---
 locales/en/index.yml                          |   3 +
 locales/it/index.yml                          |   3 +
 .../components/Home/ArchiveRestoreBar.tsx     | 108 +++
 .../components/Home/DS/DoubleAvatar.tsx       |   2 +-
 .../messages/components/Home/EmptyList.tsx    |  43 +-
 .../messages/components/Home/MessageList.tsx  |   8 +-
 .../components/Home/PagerViewContainer.tsx    |  38 +-
 .../messages/components/Home/Toasts.tsx       |  37 +-
 .../Home/WrappedMessageListItem.tsx           |  89 ++-
 .../Home/__mocks__/SecuritySuggestions.tsx    |   2 +-
 .../__tests__/WrappedMessageListItem.test.tsx |   8 +-
 .../WrappedMessageListItem.test.tsx.snap      | 504 +-------------
 .../Home/__tests__/homeUtils.test.ts          |  10 +-
 .../messages/components/Home/homeUtils.ts     |  29 +-
 .../__test__/handleLoadMessageData.test.ts    |   5 +-
 ...handleUpsertMessageStatusAttribues.test.ts |  16 +-
 .../handleUpsertMessageStatusAttribues.ts     |  86 ---
 .../handleUpsertMessageStatusAttributes.ts    | 230 +++++++
 ts/features/messages/saga/index.ts            |  14 +-
 .../__tests__/MessagesHomeScreen.test.tsx     |   1 +
 .../MessagesHomeScreen.test.tsx.snap          | 644 +-----------------
 .../messages/store/actions/archiving.ts       |  27 +
 ts/features/messages/store/actions/index.ts   |  12 +
 .../messages/store/reducers/allPaginated.ts   |  67 +-
 .../messages/store/reducers/archiving.ts      | 157 +++++
 ts/features/messages/store/reducers/index.ts  |  19 +-
 ts/features/messages/utils/index.ts           |   5 +
 .../screens/LegacyAttachmentPreviewScreen.tsx |  23 +-
 ts/features/pn/store/reducers/index.ts        |   3 +-
 .../sagas/__tests__/notifications.test.ts     |  34 +
 .../pushNotifications/sagas/notifications.ts  |  13 +
 .../utils/configurePushNotification.ts        |   9 +-
 ts/navigation/AppStackNavigator.tsx           |   7 +-
 .../components/HeaderFirstLevelHandler.tsx    |  36 +-
 ts/navigation/linkingSubscription.ts          |  26 +
 ts/navigation/params/AppParamsList.ts         |   9 +
 .../LanguagesPreferencesScreen.test.tsx       |   3 +-
 ts/utils/testWrapper.tsx                      |   7 +-
 38 files changed, 941 insertions(+), 1396 deletions(-)
 create mode 100644 ts/features/messages/components/Home/ArchiveRestoreBar.tsx
 delete mode 100644 ts/features/messages/saga/handleUpsertMessageStatusAttribues.ts
 create mode 100644 ts/features/messages/saga/handleUpsertMessageStatusAttributes.ts
 create mode 100644 ts/features/messages/store/actions/archiving.ts
 create mode 100644 ts/features/messages/store/reducers/archiving.ts
 create mode 100644 ts/navigation/linkingSubscription.ts

diff --git a/locales/en/index.yml b/locales/en/index.yml
index f6052b8ac1b..87681570476 100644
--- a/locales/en/index.yml
+++ b/locales/en/index.yml
@@ -2014,6 +2014,9 @@ messages:
     archive:
       success: "Successfully archived!"
       failure: "Failed to archive"
+    generic:
+      failure: "Operation failed"
+      success: "Operazione successful!"
     restore:
       success: "Successfully unarchived."
       failure: "Failed to unarchive"
diff --git a/locales/it/index.yml b/locales/it/index.yml
index 7d3e605ec50..58a495f647d 100644
--- a/locales/it/index.yml
+++ b/locales/it/index.yml
@@ -2014,6 +2014,9 @@ messages:
     archive:
       success: "Archiviazione riuscita!"
       failure: "L’archiviazione non è andata a buon fine"
+    generic:
+      failure: "L'operazione non è andata a buon fine"
+      success: "Operazione riuscita!"
     restore:
       success: "Ripristino effettuato."
       failure: "Il ripristino non è andato a buon fine"
diff --git a/ts/features/messages/components/Home/ArchiveRestoreBar.tsx b/ts/features/messages/components/Home/ArchiveRestoreBar.tsx
new file mode 100644
index 00000000000..0928d7da973
--- /dev/null
+++ b/ts/features/messages/components/Home/ArchiveRestoreBar.tsx
@@ -0,0 +1,108 @@
+import React, { useCallback, useEffect } from "react";
+import { StyleSheet, View } from "react-native";
+import { ButtonOutline, ButtonSolid } from "@pagopa/io-app-design-system";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import {
+  useIODispatch,
+  useIOSelector,
+  useIOStore
+} from "../../../../store/hooks";
+import {
+  areThereEntriesForShownMessageListCategorySelector,
+  isArchivingDisabledSelector,
+  isArchivingInProcessingModeSelector
+} from "../../store/reducers/archiving";
+import { useIOTabNavigation } from "../../../../navigation/params/AppParamsList";
+import { shownMessageCategorySelector } from "../../store/reducers/allPaginated";
+import I18n from "../../../../i18n";
+import {
+  resetMessageArchivingAction,
+  startProcessingMessageArchivingAction
+} from "../../store/actions/archiving";
+import { MessageListCategory } from "../../types/messageListCategory";
+import { useHardwareBackButton } from "../../../../hooks/useHardwareBackButton";
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: "row",
+    paddingHorizontal: 24,
+    paddingTop: 8
+  },
+  endButtonContainer: {
+    flex: 1,
+    marginStart: 4
+  },
+  startButtonContainer: {
+    flex: 1,
+    marginEnd: 4
+  }
+});
+
+type ArchiveRestoreCTAsProps = {
+  category: MessageListCategory;
+};
+
+export const ArchiveRestoreBar = () => {
+  const store = useIOStore();
+  const tabNavigation = useIOTabNavigation();
+
+  const isArchivingDisabled = useIOSelector(isArchivingDisabledSelector);
+  const shownCategory = useIOSelector(shownMessageCategorySelector);
+
+  const androidBackButtonCallback = useCallback(() => {
+    // Disable Android back button while processing archiving/restoring
+    const state = store.getState();
+    return isArchivingInProcessingModeSelector(state);
+  }, [store]);
+  useHardwareBackButton(androidBackButtonCallback);
+
+  useEffect(() => {
+    tabNavigation.setOptions({
+      tabBarStyle: {
+        display: isArchivingDisabled ? "flex" : "none"
+      }
+    });
+  }, [isArchivingDisabled, tabNavigation]);
+
+  if (isArchivingDisabled) {
+    return null;
+  }
+
+  return <ArchiveRestoreCTAs category={shownCategory} />;
+};
+
+const ArchiveRestoreCTAs = ({ category }: ArchiveRestoreCTAsProps) => {
+  const safeAreaInsets = useSafeAreaInsets();
+  const dispatch = useIODispatch();
+
+  const archiveRestoreCTAEnabled = useIOSelector(state =>
+    areThereEntriesForShownMessageListCategorySelector(state, category)
+  );
+  const isProcessing = useIOSelector(isArchivingInProcessingModeSelector);
+
+  const rightButtonLabel = I18n.t(
+    `messages.cta.${category === "ARCHIVE" ? "unarchive" : "archive"}`
+  );
+  return (
+    <View
+      style={[styles.container, { paddingBottom: 8 + safeAreaInsets.bottom }]}
+    >
+      <View style={styles.startButtonContainer}>
+        <ButtonOutline
+          label="Annulla"
+          fullWidth
+          onPress={() => dispatch(resetMessageArchivingAction(undefined))}
+        />
+      </View>
+      <View style={styles.endButtonContainer}>
+        <ButtonSolid
+          disabled={!archiveRestoreCTAEnabled}
+          label={rightButtonLabel}
+          loading={isProcessing}
+          fullWidth
+          onPress={() => dispatch(startProcessingMessageArchivingAction())}
+        />
+      </View>
+    </View>
+  );
+};
diff --git a/ts/features/messages/components/Home/DS/DoubleAvatar.tsx b/ts/features/messages/components/Home/DS/DoubleAvatar.tsx
index d5e5eae40e0..3509fa4bcda 100644
--- a/ts/features/messages/components/Home/DS/DoubleAvatar.tsx
+++ b/ts/features/messages/components/Home/DS/DoubleAvatar.tsx
@@ -175,7 +175,7 @@ export const DoubleAvatar = ({ backgroundLogoUri }: DoubleAvatarProps) => {
             }
           ]}
         >
-          <Icon name="productPagoPA" color="blueIO-500" size={20} />
+          <Icon name="productPagoPA" color="blueItalia-500" size={20} />
         </View>
       </View>
     </View>
diff --git a/ts/features/messages/components/Home/EmptyList.tsx b/ts/features/messages/components/Home/EmptyList.tsx
index 5c8748bb4d6..fd203515b51 100644
--- a/ts/features/messages/components/Home/EmptyList.tsx
+++ b/ts/features/messages/components/Home/EmptyList.tsx
@@ -1,12 +1,19 @@
-import React, { useMemo } from "react";
+import React, { useCallback, useMemo } from "react";
+import { constUndefined, pipe } from "fp-ts/lib/function";
+import * as B from "fp-ts/lib/boolean";
 import { ButtonSolidProps, IOPictograms } from "@pagopa/io-app-design-system";
-import { useIODispatch, useIOSelector } from "../../../../store/hooks";
+import {
+  useIODispatch,
+  useIOSelector,
+  useIOStore
+} from "../../../../store/hooks";
 import { emptyListReasonSelector } from "../../store/reducers/allPaginated";
 import { OperationResultScreenContent } from "../../../../components/screens/OperationResultScreenContent";
 import I18n from "../../../../i18n";
 import { reloadAllMessages } from "../../store/actions";
 import { pageSize } from "../../../../config";
 import { MessageListCategory } from "../../types/messageListCategory";
+import { isArchivingInProcessingModeSelector } from "../../store/reducers/archiving";
 
 export type EmptyListProps = {
   category: MessageListCategory;
@@ -24,9 +31,31 @@ type ScreenDataType = {
 
 export const EmptyList = ({ category }: EmptyListProps) => {
   const dispatch = useIODispatch();
+  const store = useIOStore();
+
   const emptyListReason = useIOSelector(state =>
     emptyListReasonSelector(state, category)
   );
+  const onRetryCallback = useCallback(
+    () =>
+      pipe(
+        store.getState(),
+        isArchivingInProcessingModeSelector,
+        B.fold(
+          () =>
+            pipe(
+              {
+                pageSize,
+                filter: { getArchived: category === "ARCHIVE" }
+              },
+              reloadAllMessages.request,
+              dispatch
+            ),
+          constUndefined
+        )
+      ),
+    [category, dispatch, store]
+  );
 
   const screenData = useMemo((): ScreenDataType | undefined => {
     switch (emptyListReason) {
@@ -42,13 +71,7 @@ export const EmptyList = ({ category }: EmptyListProps) => {
           action: {
             testID: "home_emptyList_retry",
             label: I18n.t("global.buttons.retry"),
-            onPress: () =>
-              dispatch(
-                reloadAllMessages.request({
-                  pageSize,
-                  filter: { getArchived: category === "ARCHIVE" }
-                })
-              )
+            onPress: onRetryCallback
           },
           pictogram: "fatalError",
           title: I18n.t("messages.loadingErrorTitle")
@@ -56,7 +79,7 @@ export const EmptyList = ({ category }: EmptyListProps) => {
       default:
         return undefined;
     }
-  }, [category, dispatch, emptyListReason]);
+  }, [category, emptyListReason, onRetryCallback]);
 
   if (!screenData) {
     return null;
diff --git a/ts/features/messages/components/Home/MessageList.tsx b/ts/features/messages/components/Home/MessageList.tsx
index 7ac4324124e..aaff8dacd54 100644
--- a/ts/features/messages/components/Home/MessageList.tsx
+++ b/ts/features/messages/components/Home/MessageList.tsx
@@ -103,7 +103,13 @@ export const MessageList = React.forwardRef<FlatList, MessageListProps>(
               />
             );
           } else {
-            return <WrappedMessageListItem index={index} message={item} />;
+            return (
+              <WrappedMessageListItem
+                index={index}
+                listCategory={category}
+                message={item}
+              />
+            );
           }
         }}
         ListFooterComponent={<Footer category={category} />}
diff --git a/ts/features/messages/components/Home/PagerViewContainer.tsx b/ts/features/messages/components/Home/PagerViewContainer.tsx
index 42549f387e2..c976a27f7ee 100644
--- a/ts/features/messages/components/Home/PagerViewContainer.tsx
+++ b/ts/features/messages/components/Home/PagerViewContainer.tsx
@@ -16,6 +16,7 @@ import {
   getMessagesViewPagerInitialPageIndex,
   messageViewPageIndexToListCategory
 } from "./homeUtils";
+import { ArchiveRestoreBar } from "./ArchiveRestoreBar";
 
 export const PagerViewContainer = React.forwardRef<PagerView>((_, ref) => {
   const dispatch = useIODispatch();
@@ -89,22 +90,25 @@ export const PagerViewContainer = React.forwardRef<PagerView>((_, ref) => {
   }, [dispatchReloadAllMessagesIfNeeded, store]);
 
   return (
-    <PagerView
-      initialPage={initialPageIndex}
-      onPageSelected={onPagerViewPageSelected}
-      ref={ref}
-      style={IOStyles.flex}
-    >
-      <MessageList
-        category={"INBOX"}
-        key={`message_list_inbox`}
-        ref={inboxFlatListRef}
-      />
-      <MessageList
-        category={"ARCHIVE"}
-        key={`message_list_category`}
-        ref={archiveFlatListRef}
-      />
-    </PagerView>
+    <>
+      <PagerView
+        initialPage={initialPageIndex}
+        onPageSelected={onPagerViewPageSelected}
+        ref={ref}
+        style={IOStyles.flex}
+      >
+        <MessageList
+          category={"INBOX"}
+          key={`message_list_inbox`}
+          ref={inboxFlatListRef}
+        />
+        <MessageList
+          category={"ARCHIVE"}
+          key={`message_list_category`}
+          ref={archiveFlatListRef}
+        />
+      </PagerView>
+      <ArchiveRestoreBar />
+    </>
   );
 });
diff --git a/ts/features/messages/components/Home/Toasts.tsx b/ts/features/messages/components/Home/Toasts.tsx
index 57dd2dc74fa..47b8b65f6e8 100644
--- a/ts/features/messages/components/Home/Toasts.tsx
+++ b/ts/features/messages/components/Home/Toasts.tsx
@@ -3,42 +3,35 @@ import { useIOToast } from "@pagopa/io-app-design-system";
 import { useIOSelector } from "../../../../store/hooks";
 import {
   archiveMessagesErrorReasonSelector,
-  inboxMessagesErrorReasonSelector,
-  latestMessageOperationToastTypeSelector,
-  latestMessageOperationTranslationKeySelector
+  inboxMessagesErrorReasonSelector
 } from "../../store/reducers/allPaginated";
 import I18n from "../../../../i18n";
+import {
+  processingResultReasonSelector,
+  processingResultTypeSelector
+} from "../../store/reducers/archiving";
 
 export const Toasts = () => {
   const toast = useIOToast();
 
   // Handling of archiving/unarchiving operations result
-  const latestMessageOperationToastType = useIOSelector(
-    latestMessageOperationToastTypeSelector
-  );
-  const latestMessageOperationTranslationKey = useIOSelector(
-    latestMessageOperationTranslationKeySelector
-  );
+  const processingResultType = useIOSelector(processingResultTypeSelector);
+  const processingResultReason = useIOSelector(processingResultReasonSelector);
   useEffect(() => {
-    if (
-      latestMessageOperationToastType &&
-      latestMessageOperationTranslationKey
-    ) {
-      const translationKey = I18n.t(latestMessageOperationTranslationKey);
-      switch (latestMessageOperationToastType) {
+    if (processingResultType && processingResultReason) {
+      switch (processingResultType) {
         case "error":
-          toast.error(translationKey);
+          toast.error(processingResultReason);
           break;
         case "success":
-          toast.success(translationKey);
+          toast.success(processingResultReason);
+          break;
+        case "warning":
+          toast.warning(processingResultReason);
           break;
       }
     }
-  }, [
-    latestMessageOperationToastType,
-    latestMessageOperationTranslationKey,
-    toast
-  ]);
+  }, [processingResultType, processingResultReason, toast]);
 
   // Handling of inbox messages errors. Be aware that any error
   // that happens when the list is empty is not displayed with
diff --git a/ts/features/messages/components/Home/WrappedMessageListItem.tsx b/ts/features/messages/components/Home/WrappedMessageListItem.tsx
index 836b6ae6aa6..cc1b745a59b 100644
--- a/ts/features/messages/components/Home/WrappedMessageListItem.tsx
+++ b/ts/features/messages/components/Home/WrappedMessageListItem.tsx
@@ -1,7 +1,9 @@
 import React, { useCallback, useMemo } from "react";
-import { pipe } from "fp-ts/lib/function";
-import * as B from "fp-ts/lib/boolean";
-import { useIODispatch, useIOSelector } from "../../../../store/hooks";
+import {
+  useIODispatch,
+  useIOSelector,
+  useIOStore
+} from "../../../../store/hooks";
 import { UIMessage } from "../../types";
 import I18n from "../../../../i18n";
 import { TagEnum as PaymentTagEnum } from "../../../../../definitions/backend/MessageCategoryPayment";
@@ -15,26 +17,41 @@ import {
   toScheduledPayload
 } from "../../store/actions/preconditions";
 import { isPaymentMessageWithPaidNoticeSelector } from "../../store/reducers/allPaginated";
+import { toggleScheduledMessageArchivingAction } from "../../store/actions/archiving";
+import { MessageListCategory } from "../../types/messageListCategory";
+import {
+  isMessageScheduledForArchivingSelector,
+  isArchivingInSchedulingModeSelector,
+  isArchivingDisabledSelector,
+  isArchivingInProcessingModeSelector
+} from "../../store/reducers/archiving";
 import { accessibilityLabelForMessageItem } from "./homeUtils";
 import { MessageListItem } from "./DS/MessageListItem";
 
 type WrappedMessageListItemProps = {
   index: number;
+  listCategory: MessageListCategory;
   message: UIMessage;
 };
 
 export const WrappedMessageListItem = ({
   index,
+  listCategory,
   message
 }: WrappedMessageListItemProps) => {
   const dispatch = useIODispatch();
   const navigation = useIONavigation();
+  const store = useIOStore();
+
   const serviceId = message.serviceId;
   const organizationFiscalCode = message.organizationFiscalCode;
 
   const isPaymentMessageWithPaidNotice = useIOSelector(state =>
     isPaymentMessageWithPaidNoticeSelector(state, message.category)
   );
+  const isSelected = useIOSelector(state =>
+    isMessageScheduledForArchivingSelector(state, message.id)
+  );
 
   const messageCategoryTag = message.category.tag;
   const doubleAvatar = messageCategoryTag === PaymentTagEnum.PAYMENT;
@@ -69,29 +86,46 @@ export const WrappedMessageListItem = ({
     [message]
   );
 
-  const onPressCallback = useCallback(
-    () =>
-      pipe(
-        message.hasPrecondition,
-        B.fold(
-          () =>
-            navigation.navigate(MESSAGES_ROUTES.MESSAGES_NAVIGATOR, {
-              screen: MESSAGES_ROUTES.MESSAGE_ROUTER,
-              params: {
-                messageId: message.id,
-                fromNotification: false
-              }
-            }),
-          () =>
-            pipe(
-              toScheduledPayload(message.id, message.category.tag),
-              scheduledPreconditionStatusAction,
-              dispatch
-            )
-        )
-      ),
-    [dispatch, message, navigation]
-  );
+  const toggleScheduledMessageArchivingCallback = useCallback(() => {
+    const state = store.getState();
+    if (!isArchivingInProcessingModeSelector(state)) {
+      dispatch(
+        toggleScheduledMessageArchivingAction({
+          messageId: message.id,
+          fromInboxToArchive: listCategory === "INBOX"
+        })
+      );
+    }
+  }, [dispatch, listCategory, message, store]);
+
+  const onPressCallback = useCallback(() => {
+    const state = store.getState();
+    if (isArchivingInSchedulingModeSelector(state)) {
+      toggleScheduledMessageArchivingCallback();
+    } else if (isArchivingDisabledSelector(state)) {
+      if (message.hasPrecondition) {
+        dispatch(
+          scheduledPreconditionStatusAction(
+            toScheduledPayload(message.id, message.category.tag)
+          )
+        );
+      } else {
+        navigation.navigate(MESSAGES_ROUTES.MESSAGES_NAVIGATOR, {
+          screen: MESSAGES_ROUTES.MESSAGE_ROUTER,
+          params: {
+            messageId: message.id,
+            fromNotification: false
+          }
+        });
+      }
+    }
+  }, [
+    dispatch,
+    message,
+    navigation,
+    store,
+    toggleScheduledMessageArchivingCallback
+  ]);
 
   return (
     <MessageListItem
@@ -102,9 +136,10 @@ export const WrappedMessageListItem = ({
       formattedDate={messageDate}
       isRead={isRead}
       messageTitle={messageTitle}
-      onLongPress={() => undefined}
+      onLongPress={toggleScheduledMessageArchivingCallback}
       onPress={onPressCallback}
       organizationName={organizationName}
+      selected={isSelected}
       serviceLogos={serviceLogoUriSources}
       serviceName={serviceName}
       testID={`wrapped_message_list_item_${index}`}
diff --git a/ts/features/messages/components/Home/__mocks__/SecuritySuggestions.tsx b/ts/features/messages/components/Home/__mocks__/SecuritySuggestions.tsx
index 30440dcff05..26e15e91a19 100644
--- a/ts/features/messages/components/Home/__mocks__/SecuritySuggestions.tsx
+++ b/ts/features/messages/components/Home/__mocks__/SecuritySuggestions.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { View } from "react-native";
 
-export const Preconditions = () => (
+export const SecuritySuggestions = () => (
   <View testID="mock_security_suggestions">
     This is a mock for Security Suggestions
   </View>
diff --git a/ts/features/messages/components/Home/__tests__/WrappedMessageListItem.test.tsx b/ts/features/messages/components/Home/__tests__/WrappedMessageListItem.test.tsx
index f2e96b0058a..f0d29e88876 100644
--- a/ts/features/messages/components/Home/__tests__/WrappedMessageListItem.test.tsx
+++ b/ts/features/messages/components/Home/__tests__/WrappedMessageListItem.test.tsx
@@ -170,7 +170,13 @@ const renderComponent = (
   } as GlobalState;
   const store = createStore(appReducer, stateWithPayment as any);
   return renderScreenWithNavigationStoreContext(
-    () => <WrappedMessageListItem index={0} message={message} />,
+    () => (
+      <WrappedMessageListItem
+        index={0}
+        listCategory="INBOX"
+        message={message}
+      />
+    ),
     MESSAGES_ROUTES.MESSAGES_HOME,
     {},
     store
diff --git a/ts/features/messages/components/Home/__tests__/__snapshots__/WrappedMessageListItem.test.tsx.snap b/ts/features/messages/components/Home/__tests__/__snapshots__/WrappedMessageListItem.test.tsx.snap
index a172e8073ae..9494926e7a4 100644
--- a/ts/features/messages/components/Home/__tests__/__snapshots__/WrappedMessageListItem.test.tsx.snap
+++ b/ts/features/messages/components/Home/__tests__/__snapshots__/WrappedMessageListItem.test.tsx.snap
@@ -468,7 +468,7 @@ exports[`WrappedMessageListItem should match snapshot, from SEND, read message 1
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -518,65 +518,6 @@ exports[`WrappedMessageListItem should match snapshot, from SEND, read message 1
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
@@ -1499,7 +1440,7 @@ exports[`WrappedMessageListItem should match snapshot, from SEND, unread message
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -1549,65 +1490,6 @@ exports[`WrappedMessageListItem should match snapshot, from SEND, unread message
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
@@ -2638,7 +2520,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                                 "borderWidth": 0,
                                               },
                                               Object {
-                                                "color": "#0B3EE3",
+                                                "color": "#0066CC",
                                               },
                                               Object {
                                                 "flex": 0,
@@ -2647,7 +2529,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                               },
                                             ]
                                           }
-                                          tintColor="#0B3EE3"
+                                          tintColor="#0066CC"
                                           vbHeight={32}
                                           vbWidth={32}
                                           width={20}
@@ -2706,7 +2588,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -2756,65 +2638,6 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
@@ -3700,7 +3523,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                                 "borderWidth": 0,
                                               },
                                               Object {
-                                                "color": "#0B3EE3",
+                                                "color": "#0066CC",
                                               },
                                               Object {
                                                 "flex": 0,
@@ -3709,7 +3532,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                               },
                                             ]
                                           }
-                                          tintColor="#0B3EE3"
+                                          tintColor="#0066CC"
                                           vbHeight={32}
                                           vbWidth={32}
                                           width={20}
@@ -3768,7 +3591,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -3818,65 +3641,6 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains p
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
@@ -4817,7 +4581,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                                 "borderWidth": 0,
                                               },
                                               Object {
-                                                "color": "#0B3EE3",
+                                                "color": "#0066CC",
                                               },
                                               Object {
                                                 "flex": 0,
@@ -4826,7 +4590,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                               },
                                             ]
                                           }
-                                          tintColor="#0B3EE3"
+                                          tintColor="#0066CC"
                                           vbHeight={32}
                                           vbWidth={32}
                                           width={20}
@@ -4885,7 +4649,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -4935,65 +4699,6 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
@@ -5754,7 +5459,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                                 "borderWidth": 0,
                                               },
                                               Object {
-                                                "color": "#0B3EE3",
+                                                "color": "#0066CC",
                                               },
                                               Object {
                                                 "flex": 0,
@@ -5763,7 +5468,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                               },
                                             ]
                                           }
-                                          tintColor="#0B3EE3"
+                                          tintColor="#0066CC"
                                           vbHeight={32}
                                           vbWidth={32}
                                           width={20}
@@ -5822,7 +5527,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -5872,65 +5577,6 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, contains u
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
@@ -6693,7 +6339,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, not a paym
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -6743,65 +6389,6 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, not a paym
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
@@ -7509,7 +7096,7 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, not a paym
                                       accessibilityRole="checkbox"
                                       accessibilityState={
                                         Object {
-                                          "checked": undefined,
+                                          "checked": false,
                                         }
                                       }
                                       accessible={true}
@@ -7559,65 +7146,6 @@ exports[`WrappedMessageListItem should match snapshot, not from SEND, not a paym
                                           ]
                                         }
                                       />
-                                      <RNSVGSvgView
-                                        align="xMidYMid"
-                                        bbHeight="100%"
-                                        bbWidth="100%"
-                                        focusable={false}
-                                        meetOrSlice={0}
-                                        minX={0}
-                                        minY={0}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "backgroundColor": "transparent",
-                                              "borderWidth": 0,
-                                            },
-                                            Object {
-                                              "flex": 0,
-                                              "height": "100%",
-                                              "width": "100%",
-                                            },
-                                          ]
-                                        }
-                                        vbHeight={24}
-                                        vbWidth={24}
-                                      >
-                                        <RNSVGGroup
-                                          fill={
-                                            Object {
-                                              "payload": 4278190080,
-                                              "type": 0,
-                                            }
-                                          }
-                                        >
-                                          <RNSVGPath
-                                            d="m7 12 4 4 7-7"
-                                            fill={null}
-                                            onLayout={[Function]}
-                                            propList={
-                                              Array [
-                                                "fill",
-                                                "stroke",
-                                                "strokeWidth",
-                                                "strokeDasharray",
-                                                "strokeLinecap",
-                                                "strokeLinejoin",
-                                              ]
-                                            }
-                                            stroke={
-                                              Object {
-                                                "payload": 4294967295,
-                                                "type": 0,
-                                              }
-                                            }
-                                            strokeDasharray={null}
-                                            strokeLinecap={1}
-                                            strokeLinejoin={1}
-                                            strokeWidth={1.5}
-                                          />
-                                        </RNSVGGroup>
-                                      </RNSVGSvgView>
                                     </View>
                                   </View>
                                 </View>
diff --git a/ts/features/messages/components/Home/__tests__/homeUtils.test.ts b/ts/features/messages/components/Home/__tests__/homeUtils.test.ts
index ada73a79f83..1e0ff91af20 100644
--- a/ts/features/messages/components/Home/__tests__/homeUtils.test.ts
+++ b/ts/features/messages/components/Home/__tests__/homeUtils.test.ts
@@ -32,6 +32,7 @@ import {
   isStrictSome,
   isStrictSomeError
 } from "../../../../../utils/pot";
+import { INITIAL_STATE } from "../../../store/reducers/archiving";
 
 const createGlobalState = (
   archiveData: allPaginated.MessagePagePot,
@@ -49,7 +50,8 @@ const createGlobalState = (
             data: inboxData
           },
           shownCategory
-        }
+        },
+        archiving: INITIAL_STATE
       }
     }
   } as GlobalState);
@@ -686,7 +688,8 @@ describe("getLoadNextPageMessagesActionIfNeeded", () => {
                               ? selectedCategoryLastRequestValue
                               : O.none
                         }
-                      }
+                      },
+                      archiving: INITIAL_STATE
                     }
                   }
                 } as GlobalState;
@@ -763,7 +766,8 @@ describe("getReloadAllMessagesActionForRefreshIfAllowed", () => {
                   inbox: {
                     data: inboxPot
                   }
-                }
+                },
+                archiving: INITIAL_STATE
               }
             }
           } as GlobalState;
diff --git a/ts/features/messages/components/Home/homeUtils.ts b/ts/features/messages/components/Home/homeUtils.ts
index d5c6a2dc268..0830f2110a8 100644
--- a/ts/features/messages/components/Home/homeUtils.ts
+++ b/ts/features/messages/components/Home/homeUtils.ts
@@ -22,6 +22,7 @@ import {
   isStrictNone,
   isStrictSomeError
 } from "../../../../utils/pot";
+import { isArchivingInProcessingModeSelector } from "../../store/reducers/archiving";
 
 export const nextPageLoadingWaitMillisecondsGenerator = () => 2000;
 
@@ -31,10 +32,18 @@ export const getInitialReloadAllMessagesActionIfNeeded = (
   pipe(state, shownMessageCategorySelector, category =>
     pipe(
       state,
-      messagePagePotFromCategorySelector(category),
-      isStrictNone,
-      B.fold(constUndefined, () =>
-        initialReloadAllMessagesFromCategory(category)
+      isArchivingInProcessingModeSelector,
+      B.fold(
+        () =>
+          pipe(
+            state,
+            messagePagePotFromCategorySelector(category),
+            isStrictNone,
+            B.fold(constUndefined, () =>
+              initialReloadAllMessagesFromCategory(category)
+            )
+          ),
+        constUndefined
       )
     )
   );
@@ -82,6 +91,12 @@ export const getLoadNextPageMessagesActionIfAllowed = (
   category: MessageListCategory,
   comparisonTimeInCaseOfError: Date
 ): ActionType<typeof loadNextPageMessages.request> | undefined => {
+  // No archiving/restoring running
+  const isProcessingArchiving = isArchivingInProcessingModeSelector(state);
+  if (isProcessingArchiving) {
+    return undefined;
+  }
+
   const allPaginated = state.entities.messages.allPaginated;
 
   // No running message loading
@@ -144,6 +159,12 @@ export const getReloadAllMessagesActionForRefreshIfAllowed = (
 ): ActionType<typeof reloadAllMessages.request> | undefined => {
   const allPaginated = state.entities.messages.allPaginated;
 
+  // No archiving/restoring running
+  const isProcessingArchiving = isArchivingInProcessingModeSelector(state);
+  if (isProcessingArchiving) {
+    return undefined;
+  }
+
   // No running message loading
   const archiveMessagePagePot = allPaginated.archive.data;
   const inboxMessagePagePot = allPaginated.inbox.data;
diff --git a/ts/features/messages/saga/__test__/handleLoadMessageData.test.ts b/ts/features/messages/saga/__test__/handleLoadMessageData.test.ts
index 5db69f1c4b5..0680dc58818 100644
--- a/ts/features/messages/saga/__test__/handleLoadMessageData.test.ts
+++ b/ts/features/messages/saga/__test__/handleLoadMessageData.test.ts
@@ -316,7 +316,10 @@ describe("setMessageReadIfNeeded", () => {
       ])
       .next(
         upsertMessageStatusAttributes.failure({
-          payload: { message: paginatedMessage, update: { tag: "reading" } },
+          payload: {
+            message: paginatedMessage,
+            update: { tag: "reading" }
+          },
           error: new Error()
         })
       )
diff --git a/ts/features/messages/saga/__test__/handleUpsertMessageStatusAttribues.test.ts b/ts/features/messages/saga/__test__/handleUpsertMessageStatusAttribues.test.ts
index e784cdfddb0..4ecf8faf767 100644
--- a/ts/features/messages/saga/__test__/handleUpsertMessageStatusAttribues.test.ts
+++ b/ts/features/messages/saga/__test__/handleUpsertMessageStatusAttribues.test.ts
@@ -8,10 +8,10 @@ import {
 import { UIMessageId } from "../../types";
 import { successReloadMessagesPayload } from "../../__mocks__/messages";
 import { withRefreshApiCall } from "../../../fastLogin/saga/utils";
-import { handleUpsertMessageStatusAttribues } from "../handleUpsertMessageStatusAttribues";
+import { handleUpsertMessageStatusAttributes } from "../handleUpsertMessageStatusAttributes";
 import { BackendClient } from "../../../../api/__mocks__/backend";
 
-describe("handleUpsertMessageStatusAttribues", () => {
+describe("handleUpsertMessageStatusAttributes", () => {
   const actionPayload: UpsertMessageStatusAttributesPayload = {
     message: {
       ...successReloadMessagesPayload.messages[0],
@@ -34,7 +34,7 @@ describe("handleUpsertMessageStatusAttribues", () => {
       action.success
     )} with the original payload`, () => {
       testSaga(
-        handleUpsertMessageStatusAttribues,
+        handleUpsertMessageStatusAttributes,
         BackendClient.upsertMessageStatusAttributes,
         action.request(actionPayload)
       )
@@ -47,6 +47,8 @@ describe("handleUpsertMessageStatusAttribues", () => {
         .next(E.right({ status: 200, value: {} }))
         .put(action.success(actionPayload))
         .next()
+        .cancelled()
+        .next(false)
         .isDone();
     });
   });
@@ -54,7 +56,7 @@ describe("handleUpsertMessageStatusAttribues", () => {
   describe("when the response is an Error", () => {
     it(`should put ${getType(action.failure)} with the error message`, () => {
       testSaga(
-        handleUpsertMessageStatusAttribues,
+        handleUpsertMessageStatusAttributes,
         BackendClient.upsertMessageStatusAttributes,
         action.request(actionPayload)
       )
@@ -77,6 +79,8 @@ describe("handleUpsertMessageStatusAttribues", () => {
           })
         )
         .next()
+        .cancelled()
+        .next(false)
         .isDone();
     });
   });
@@ -84,7 +88,7 @@ describe("handleUpsertMessageStatusAttribues", () => {
   describe("when the handler throws", () => {
     it(`should catch it and put ${getType(action.failure)}`, () => {
       testSaga(
-        handleUpsertMessageStatusAttribues,
+        handleUpsertMessageStatusAttributes,
         BackendClient.upsertMessageStatusAttributes,
         action.request(actionPayload)
       )
@@ -97,6 +101,8 @@ describe("handleUpsertMessageStatusAttribues", () => {
           })
         )
         .next()
+        .cancelled()
+        .next(false)
         .isDone();
     });
   });
diff --git a/ts/features/messages/saga/handleUpsertMessageStatusAttribues.ts b/ts/features/messages/saga/handleUpsertMessageStatusAttribues.ts
deleted file mode 100644
index 73ab778761d..00000000000
--- a/ts/features/messages/saga/handleUpsertMessageStatusAttribues.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { call, put } from "typed-redux-saga/macro";
-import { ActionType } from "typesafe-actions";
-import { MessageStatusArchivingChange } from "../../../../definitions/backend/MessageStatusArchivingChange";
-import { MessageStatusBulkChange } from "../../../../definitions/backend/MessageStatusBulkChange";
-import { MessageStatusChange } from "../../../../definitions/backend/MessageStatusChange";
-import { MessageStatusReadingChange } from "../../../../definitions/backend/MessageStatusReadingChange";
-import { BackendClient } from "../../../api/backend";
-import {
-  upsertMessageStatusAttributes,
-  UpsertMessageStatusAttributesPayload
-} from "../store/actions";
-import { SagaCallReturnType } from "../../../types/utils";
-import { getError } from "../../../utils/errors";
-import { withRefreshApiCall } from "../../fastLogin/saga/utils";
-import { errorToReason, unknownToReason } from "../utils";
-import { trackUpsertMessageStatusAttributesFailure } from "../analytics";
-import { handleResponse } from "../utils/responseHandling";
-
-/**
- * @throws invalid payload
- * @param payload
- */
-function validatePayload(
-  payload: UpsertMessageStatusAttributesPayload
-): MessageStatusChange {
-  switch (payload.update.tag) {
-    case "archiving":
-      return {
-        change_type: "archiving",
-        is_archived: payload.update.isArchived
-      } as MessageStatusArchivingChange;
-    case "reading":
-      return {
-        change_type: "reading",
-        is_read: true
-      } as MessageStatusReadingChange;
-    case "bulk":
-      return {
-        change_type: "bulk",
-        is_read: true,
-        is_archived: payload.update.isArchived
-      } as MessageStatusBulkChange;
-    default:
-      throw new TypeError("invalid payload");
-  }
-}
-
-export function* handleUpsertMessageStatusAttribues(
-  putMessage: BackendClient["upsertMessageStatusAttributes"],
-  action: ActionType<typeof upsertMessageStatusAttributes.request>
-) {
-  try {
-    const body = validatePayload(action.payload);
-    const response = (yield* call(
-      withRefreshApiCall,
-      putMessage({ id: action.payload.message.id, body }),
-      action
-    )) as unknown as SagaCallReturnType<typeof putMessage>;
-
-    const nextAction = handleResponse<unknown>(
-      response,
-      _ => upsertMessageStatusAttributes.success(action.payload),
-      error => {
-        const reason = errorToReason(error);
-        trackUpsertMessageStatusAttributesFailure(reason);
-        return upsertMessageStatusAttributes.failure({
-          error: getError(error),
-          payload: action.payload
-        });
-      }
-    );
-
-    if (nextAction) {
-      yield* put(nextAction);
-    }
-  } catch (error) {
-    const reason = unknownToReason(error);
-    trackUpsertMessageStatusAttributesFailure(reason);
-    yield* put(
-      upsertMessageStatusAttributes.failure({
-        error: getError(error),
-        payload: action.payload
-      })
-    );
-  }
-}
diff --git a/ts/features/messages/saga/handleUpsertMessageStatusAttributes.ts b/ts/features/messages/saga/handleUpsertMessageStatusAttributes.ts
new file mode 100644
index 00000000000..d10eb529628
--- /dev/null
+++ b/ts/features/messages/saga/handleUpsertMessageStatusAttributes.ts
@@ -0,0 +1,230 @@
+import {
+  call,
+  cancelled,
+  put,
+  race,
+  take,
+  select
+} from "typed-redux-saga/macro";
+import { ActionType, isActionOf } from "typesafe-actions";
+import { MessageStatusArchivingChange } from "../../../../definitions/backend/MessageStatusArchivingChange";
+import { MessageStatusBulkChange } from "../../../../definitions/backend/MessageStatusBulkChange";
+import { MessageStatusChange } from "../../../../definitions/backend/MessageStatusChange";
+import { MessageStatusReadingChange } from "../../../../definitions/backend/MessageStatusReadingChange";
+import { BackendClient } from "../../../api/backend";
+import {
+  upsertMessageStatusAttributes,
+  UpsertMessageStatusAttributesPayload
+} from "../store/actions";
+import { SagaCallReturnType } from "../../../types/utils";
+import { getError } from "../../../utils/errors";
+import { withRefreshApiCall } from "../../fastLogin/saga/utils";
+import { errorToReason, unknownToReason } from "../utils";
+import { trackUpsertMessageStatusAttributesFailure } from "../analytics";
+import { handleResponse } from "../utils/responseHandling";
+import {
+  resetMessageArchivingAction,
+  interruptMessageArchivingProcessingAction,
+  removeScheduledMessageArchivingAction,
+  startProcessingMessageArchivingAction
+} from "../store/actions/archiving";
+import { nextQueuedMessageDataUncachedSelector } from "../store/reducers/archiving";
+import { paginatedMessageFromIdForCategorySelector } from "../store/reducers/allPaginated";
+import { MessageListCategory } from "../types/messageListCategory";
+import I18n from "../../../i18n";
+
+/**
+ * @throws invalid payload
+ * @param payload
+ */
+function validatePayload(
+  payload: UpsertMessageStatusAttributesPayload
+): MessageStatusChange {
+  switch (payload.update.tag) {
+    case "archiving":
+      return {
+        change_type: "archiving",
+        is_archived: payload.update.isArchived
+      } as MessageStatusArchivingChange;
+    case "reading":
+      return {
+        change_type: "reading",
+        is_read: true
+      } as MessageStatusReadingChange;
+    case "bulk":
+      return {
+        change_type: "bulk",
+        is_read: true,
+        is_archived: payload.update.isArchived
+      } as MessageStatusBulkChange;
+    default:
+      throw new TypeError("invalid payload");
+  }
+}
+
+/**
+ * The algorithm of this saga is as follows:
+ *
+ * Get awaken by the receival of `startProcessingMessageArchivingAction` in takeLastest mode
+ * do {
+ *   Extract the first message ID for archiving/restoring queues, along with the info about archiving or restoring the message
+ *   If no data was returned, then the process has ended. Dispatch resetMessageArchivingAction with success
+ *   Otherwise
+ *     Given the message id, look for it in the related message page (inbox or archived)
+ *     If no message has been found, then it was already processed somehow, just discard the ID from the archiving/restoring queues
+ *       (by dispatching removeScheduledMessageArchivingAction) and continue to the next do-while loop interaction
+ *     Otherwise
+ *       Build and dispatch the legacy upsertMessageStatusAttributes.request. Such action triggers the legacy saga which uses the
+ *        legacy archiving/restoring logic to move the message to the other list, contact the server and, in case of a failure, puts
+ *        back the message to the source list). Such saga is raced against resetMessageArchivingAction in order to be cancelable
+ *       Listen for the saga async output action, which is either upsertMessageStatusAttributes.success or upsertMessageStatusAttributes.success
+ *         but also for resetMessageArchivingAction to avoid a race conidtion where the saga fails one moment before the user cancels the
+ *         processing (dispatching resetMessageArchivingAction by the UI button)
+ *       If upsertMessageStatusAttributes.failure is received, then cancel the processing using interruptMessageArchivingProcessingAction (which
+ *         does not clear the user selection) and stop the current saga
+ *       If upsertMessageStatusAttributes.success is received, then discard the ID from the archiving/restoring queues (by dispatching
+ *         removeScheduledMessageArchivingAction) and continue to the next do-while loop interaction
+ *       If resetMessageArchivingAction is received, then just go to the next do-while loop interaction, which will extract no data from the
+ *         archiving/restoring queues (since they have been emptied by resetMessageArchivingAction) and will terminate
+ * } while (true)
+ *
+ * If the session expires (due to fast login), it is expected that the legacy saga fails with a 401 error and the
+ * 'upsertMessageStatusAttributes.failure' is triggered. If the authentication session is later restored, the original
+ * 'upsertMessageStatusAttributes.request' action will be redispatched and the related legacy saga will either succeed or fail. At this point
+ * the user may either discard the scheduled archiving/restoring of messages, in which case the UI is consistent (since the message has been
+ * moved) or she may retry the restoring/archiving, in which case the message ID will not have a match into the original message collection
+ * (INBOX or ARCHIVE) and so it will just be discarded, leaving the UI consistent. In case the automatically dispatched action from fast
+ * login had failed, there will be a match and the process will resume.
+ *
+ */
+export function* handleMessageArchivingRestoring(
+  _: ActionType<typeof startProcessingMessageArchivingAction>
+) {
+  do {
+    const currentEntryToProcess = yield* select(
+      nextQueuedMessageDataUncachedSelector
+    );
+    if (!currentEntryToProcess) {
+      const userFeedback = I18n.t("messages.operations.generic.success");
+      yield* put(
+        resetMessageArchivingAction({ type: "success", reason: userFeedback })
+      );
+      return;
+    }
+
+    const category: MessageListCategory = currentEntryToProcess.archiving
+      ? "INBOX"
+      : "ARCHIVE";
+    const message = yield* select(
+      paginatedMessageFromIdForCategorySelector,
+      currentEntryToProcess.messageId,
+      category
+    );
+    if (!message) {
+      yield* put(
+        removeScheduledMessageArchivingAction({
+          fromInboxToArchive: currentEntryToProcess.archiving,
+          messageId: currentEntryToProcess.messageId
+        })
+      );
+      continue;
+    }
+
+    const upsertMessageStatusAttributesAction =
+      upsertMessageStatusAttributes.request({
+        message,
+        update: {
+          isArchived: currentEntryToProcess.archiving,
+          tag: "archiving"
+        }
+      });
+    yield* put(upsertMessageStatusAttributesAction);
+
+    const outputAction = yield* take([
+      upsertMessageStatusAttributes.success,
+      upsertMessageStatusAttributes.failure,
+      resetMessageArchivingAction
+    ]);
+
+    if (isActionOf(upsertMessageStatusAttributes.success, outputAction)) {
+      yield* put(
+        removeScheduledMessageArchivingAction({
+          fromInboxToArchive: currentEntryToProcess.archiving,
+          messageId: currentEntryToProcess.messageId
+        })
+      );
+    } else {
+      if (isActionOf(upsertMessageStatusAttributes.failure, outputAction)) {
+        const userFeedback = I18n.t("messages.operations.generic.failure");
+        yield* put(
+          interruptMessageArchivingProcessingAction({
+            type: "error",
+            reason: userFeedback
+          })
+        );
+      }
+      return;
+    }
+  } while (true);
+}
+
+// Be aware that this saga is execute with a takeEvery, in order to remain
+// compatible with the old messages home way of archiving messages
+export function* raceUpsertMessageStatusAttributes(
+  putMessage: BackendClient["upsertMessageStatusAttributes"],
+  action: ActionType<typeof upsertMessageStatusAttributes.request>
+) {
+  yield* race({
+    task: call(handleUpsertMessageStatusAttributes, putMessage, action),
+    cancel: take(resetMessageArchivingAction)
+  });
+}
+
+export function* handleUpsertMessageStatusAttributes(
+  putMessage: BackendClient["upsertMessageStatusAttributes"],
+  action: ActionType<typeof upsertMessageStatusAttributes.request>
+) {
+  try {
+    const body = validatePayload(action.payload);
+    const response = (yield* call(
+      withRefreshApiCall,
+      putMessage({ id: action.payload.message.id, body }),
+      action
+    )) as SagaCallReturnType<typeof putMessage>;
+
+    const nextAction = handleResponse<unknown>(
+      response,
+      _ => upsertMessageStatusAttributes.success(action.payload),
+      error => {
+        const reason = errorToReason(error);
+        trackUpsertMessageStatusAttributesFailure(reason);
+        return upsertMessageStatusAttributes.failure({
+          error: getError(error),
+          payload: action.payload
+        });
+      }
+    );
+
+    if (nextAction) {
+      yield* put(nextAction);
+    }
+  } catch (error) {
+    const reason = unknownToReason(error);
+    trackUpsertMessageStatusAttributesFailure(reason);
+    yield* put(
+      upsertMessageStatusAttributes.failure({
+        error: getError(error),
+        payload: action.payload
+      })
+    );
+  } finally {
+    if (yield* cancelled()) {
+      yield* put(
+        upsertMessageStatusAttributes.failure({
+          error: getError("Cancelled"),
+          payload: action.payload
+        })
+      );
+    }
+  }
+}
diff --git a/ts/features/messages/saga/index.ts b/ts/features/messages/saga/index.ts
index ef7e2b5b041..1a12c5bc4fc 100644
--- a/ts/features/messages/saga/index.ts
+++ b/ts/features/messages/saga/index.ts
@@ -28,6 +28,7 @@ import {
   getLegacyMessagePrecondition,
   retrievingDataPreconditionStatusAction
 } from "../store/actions/preconditions";
+import { startProcessingMessageArchivingAction } from "../store/actions/archiving";
 import { handleDownloadAttachment } from "./handleDownloadAttachment";
 import {
   handleClearAllAttachments,
@@ -39,7 +40,10 @@ import { handleLoadPreviousPageMessages } from "./handleLoadPreviousPageMessages
 import { handleReloadAllMessages } from "./handleReloadAllMessages";
 import { handleLoadMessageById } from "./handleLoadMessageById";
 import { handleLoadMessageDetails } from "./handleLoadMessageDetails";
-import { handleUpsertMessageStatusAttribues } from "./handleUpsertMessageStatusAttribues";
+import {
+  handleMessageArchivingRestoring,
+  raceUpsertMessageStatusAttributes
+} from "./handleUpsertMessageStatusAttributes";
 import { handleMigrateToPagination } from "./handleMigrateToPagination";
 import { handleMessagePrecondition } from "./handleMessagePrecondition";
 import { handleThirdPartyMessage } from "./handleThirdPartyMessage";
@@ -99,11 +103,17 @@ export function* watchMessagesSaga(
     backendClient.getThirdPartyMessage
   );
 
+  // Be aware that this saga must use the takeEvery
+  // due to compatibility with the old messages home
   yield* takeEvery(
     upsertMessageStatusAttributes.request,
-    handleUpsertMessageStatusAttribues,
+    raceUpsertMessageStatusAttributes,
     backendClient.upsertMessageStatusAttributes
   );
+  yield* takeLatest(
+    startProcessingMessageArchivingAction,
+    handleMessageArchivingRestoring
+  );
 
   yield* fork(watchLoadMessageData);
 
diff --git a/ts/features/messages/screens/__tests__/MessagesHomeScreen.test.tsx b/ts/features/messages/screens/__tests__/MessagesHomeScreen.test.tsx
index 18adb30c7e2..8b8281002c1 100644
--- a/ts/features/messages/screens/__tests__/MessagesHomeScreen.test.tsx
+++ b/ts/features/messages/screens/__tests__/MessagesHomeScreen.test.tsx
@@ -9,6 +9,7 @@ import { MessagesHomeScreen } from "../MessagesHomeScreen";
 
 jest.mock("../../components/Home/PagerViewContainer");
 jest.mock("../../components/Home/Preconditions");
+jest.mock("../../components/Home/SecuritySuggestions");
 jest.mock("../../components/Home/TabNavigationContainer");
 jest.mock("../../components/Home/Toasts");
 
diff --git a/ts/features/messages/screens/__tests__/__snapshots__/MessagesHomeScreen.test.tsx.snap b/ts/features/messages/screens/__tests__/__snapshots__/MessagesHomeScreen.test.tsx.snap
index d2e8005bc2f..4de69bb5995 100644
--- a/ts/features/messages/screens/__tests__/__snapshots__/MessagesHomeScreen.test.tsx.snap
+++ b/ts/features/messages/screens/__tests__/__snapshots__/MessagesHomeScreen.test.tsx.snap
@@ -408,647 +408,11 @@ exports[`MessagesHomeScreen should match snapshot (with mocked components 1`] =
                         >
                           This is a mock for Preconditions
                         </View>
-                        <Modal
-                          accessibilityPositionChangeAnnouncement=""
-                          accessible={false}
-                          backdropComponent={[Function]}
-                          enableDismissOnClose={true}
-                          footerComponent={[Function]}
-                          handleComponent={[Function]}
-                          handleComponentAccessibility={
-                            Object {
-                              "accessible": false,
-                            }
-                          }
-                          hardwareAccelerated={false}
-                          importantForAccessibility="yes"
-                          snapPoints={
-                            Array [
-                              1,
-                            ]
-                          }
-                          style={
-                            Object {
-                              "borderCurve": "continuous",
-                              "borderTopLeftRadius": 24,
-                              "borderTopRightRadius": 24,
-                              "overflow": "hidden",
-                            }
-                          }
-                          visible={true}
+                        <View
+                          testID="mock_security_suggestions"
                         >
-                          <RCTScrollView
-                            style={
-                              Object {
-                                "flex": 1,
-                                "paddingHorizontal": 24,
-                              }
-                            }
-                          >
-                            <View>
-                              <View
-                                onLayout={[Function]}
-                              >
-                                <View>
-                                  <View
-                                    style={
-                                      Array [
-                                        Object {
-                                          "flex": 1,
-                                        },
-                                        Object {
-                                          "flexDirection": "row",
-                                        },
-                                        Object {
-                                          "alignItems": "center",
-                                        },
-                                      ]
-                                    }
-                                  >
-                                    <RNSVGSvgView
-                                      accessibilityElementsHidden={true}
-                                      accessibilityLabel=""
-                                      accessible={false}
-                                      align="xMidYMid"
-                                      bbHeight={24}
-                                      bbWidth={24}
-                                      focusable={false}
-                                      height={24}
-                                      importantForAccessibility="no-hide-descendants"
-                                      meetOrSlice={0}
-                                      minX={0}
-                                      minY={0}
-                                      style={
-                                        Array [
-                                          Object {
-                                            "backgroundColor": "transparent",
-                                            "borderWidth": 0,
-                                          },
-                                          Object {
-                                            "color": "#BBC2D6",
-                                          },
-                                          Object {
-                                            "flex": 0,
-                                            "height": 24,
-                                            "width": 24,
-                                          },
-                                        ]
-                                      }
-                                      tintColor="#BBC2D6"
-                                      vbHeight={24}
-                                      vbWidth={24}
-                                      width={24}
-                                    >
-                                      <RNSVGGroup
-                                        fill={
-                                          Object {
-                                            "payload": 4278190080,
-                                            "type": 0,
-                                          }
-                                        }
-                                      >
-                                        <RNSVGPath
-                                          clipRule={0}
-                                          d="M5.3669 22.0799C5.54087 22.2122 5.75341 22.2839 5.972 22.284C6.15303 22.284 6.33068 22.2349 6.486 22.142C11 19.433 11 13.946 11 10.999C11 10.7337 11.1054 10.4794 11.2929 10.2918C11.4804 10.1043 11.7348 9.99895 12 9.99895C12.2652 9.99895 12.5196 10.1043 12.7071 10.2918C12.8946 10.4794 13 10.7337 13 10.999C13 11.2642 13.1054 11.5185 13.2929 11.7061C13.4804 11.8936 13.7348 11.999 14 11.999C14.2652 11.999 14.5196 11.8936 14.7071 11.7061C14.8946 11.5185 15 11.2642 15 10.999C15 10.2033 14.6839 9.44024 14.1213 8.87763C13.5587 8.31502 12.7956 7.99895 12 7.99895C11.2044 7.99895 10.4413 8.31502 9.87868 8.87763C9.31607 9.44024 9 10.2033 9 10.999C9 13.729 9 18.299 5.457 20.427C5.26967 20.5396 5.12441 20.7105 5.04345 20.9135C4.96248 21.1166 4.95027 21.3406 5.00869 21.5512C5.0671 21.7618 5.19292 21.9475 5.3669 22.0799ZM14.896 14.084C14.55 18.171 13.217 21.405 10.935 23.705V23.701C10.748 23.8891 10.494 23.9953 10.2287 23.9962C9.96341 23.997 9.70867 23.8924 9.5205 23.7055C9.33233 23.5185 9.22614 23.2644 9.2253 22.9991C9.22445 22.7339 9.32902 22.4791 9.516 22.291C11.485 20.31 12.593 17.567 12.904 13.91C12.913 13.7783 12.9483 13.6499 13.008 13.5322C13.0677 13.4146 13.1504 13.3102 13.2513 13.2252C13.3521 13.1401 13.4691 13.0763 13.5951 13.0375C13.7212 12.9986 13.8538 12.9855 13.985 12.999C14.1161 13.0102 14.2438 13.0471 14.3606 13.1078C14.4774 13.1684 14.5811 13.2515 14.6658 13.3523C14.7504 13.4531 14.8143 13.5696 14.8538 13.6952C14.8933 13.8207 14.9077 13.9529 14.896 14.084ZM17.643 20.338C17.2467 21.4455 16.7416 22.5111 16.135 23.519C16.0668 23.6313 15.9772 23.7291 15.8713 23.8068C15.7653 23.8845 15.6451 23.9406 15.5174 23.9719C15.2597 24.035 14.9874 23.9931 14.7605 23.8555C14.6482 23.7873 14.5503 23.6977 14.4726 23.5917C14.3949 23.4858 14.3388 23.3655 14.3076 23.2379C14.2763 23.1103 14.2705 22.9777 14.2905 22.8478C14.3105 22.718 14.3558 22.5933 14.424 22.481C14.9617 21.5869 15.4099 20.642 15.762 19.66C15.8562 19.4164 16.0421 19.2193 16.2797 19.1109C16.5174 19.0026 16.788 18.9915 17.0337 19.08C17.2794 19.1686 17.4808 19.3498 17.5946 19.5849C17.7085 19.82 17.7258 20.0902 17.643 20.338ZM19 10.999C19.038 13.0741 18.8705 15.1478 18.5 17.19C18.4558 17.4173 18.334 17.6223 18.1554 17.7698C17.9769 17.9174 17.7526 17.9984 17.521 17.999C17.4562 17.999 17.3915 17.9927 17.328 17.98C17.0679 17.9292 16.8386 17.7772 16.6905 17.5574C16.5423 17.3377 16.4875 17.0681 16.538 16.808C16.8821 14.8915 17.0369 12.9458 17 10.999C16.9993 9.98698 16.6916 8.99903 16.1174 8.16568C15.5433 7.33234 14.7298 6.69282 13.7845 6.33166C12.8391 5.97049 11.8064 5.90468 10.8229 6.14292C9.83937 6.38116 8.95128 6.91223 8.276 7.66595C8.18966 7.7681 8.08371 7.85189 7.96441 7.91236C7.84512 7.97284 7.7149 8.00877 7.58148 8.01802C7.44805 8.02728 7.31412 8.00968 7.18762 7.96626C7.06111 7.92283 6.94461 7.85448 6.84499 7.76523C6.74537 7.67598 6.66467 7.56766 6.60766 7.44667C6.55065 7.32568 6.51849 7.19449 6.51308 7.06085C6.50768 6.92721 6.52913 6.79384 6.57618 6.66864C6.62323 6.54345 6.69492 6.42896 6.787 6.33195C7.73248 5.27691 8.97584 4.53359 10.3528 4.20021C11.7297 3.86683 13.1753 3.95909 14.4987 4.46479C15.8221 4.9705 16.9609 5.86585 17.7646 7.03251C18.5683 8.19918 18.9991 9.58225 19 10.999ZM7.069 10.166C7.02279 10.4412 6.99971 10.7198 7 10.999C7 16.774 4.88732 19.9713 1.0499 19.9988C1.03337 19.9996 1.01673 20 1 20C0.447715 20 0 19.5523 0 19C0 18.9998 4.50013e-08 18.9997 1.34992e-07 18.9995C4.49994e-08 18.9993 0 18.9991 0 18.999C0 18.7337 0.105357 18.4794 0.292893 18.2918C0.48043 18.1043 0.734784 17.999 1 17.999C3.654 17.999 5 15.644 5 10.999C5.00054 10.6078 5.03399 10.2175 5.1 9.83195C5.11551 9.69701 5.15835 9.56664 5.2259 9.44879C5.29346 9.33095 5.38431 9.2281 5.49293 9.14653C5.60154 9.06496 5.72563 9.00637 5.85763 8.97433C5.98963 8.9423 6.12678 8.9375 6.2607 8.96021C6.39462 8.98293 6.52251 9.03269 6.63657 9.10646C6.75062 9.18024 6.84845 9.27647 6.92409 9.3893C6.99972 9.50212 7.05158 9.62918 7.0765 9.76271C7.10141 9.89624 7.09886 10.0334 7.069 10.166ZM23 10.999C23.13 15.2538 22.3457 19.4871 20.7 23.413C20.6208 23.587 20.4934 23.7348 20.3328 23.8386C20.1722 23.9425 19.9852 23.9981 19.794 23.999C19.6514 23.9992 19.5105 23.9685 19.381 23.909C19.2612 23.8549 19.1532 23.7778 19.0632 23.682C18.9732 23.5862 18.9029 23.4736 18.8565 23.3506C18.8101 23.2276 18.7883 23.0967 18.7925 22.9653C18.7967 22.834 18.8268 22.7047 18.881 22.585C20.4035 18.9177 21.1259 14.9677 21 10.999C21.0029 9.64107 20.695 8.30052 20.1 7.07995C20.0425 6.96176 20.0089 6.83342 20.0011 6.70224C19.9932 6.57106 20.0113 6.43961 20.0542 6.31542C20.0972 6.19122 20.1642 6.07669 20.2514 5.97839C20.3386 5.88008 20.4443 5.79991 20.5625 5.74245C20.6807 5.685 20.809 5.65139 20.9402 5.64354C21.0714 5.63569 21.2028 5.65375 21.327 5.6967C21.4512 5.73965 21.5658 5.80663 21.6641 5.89384C21.7624 5.98105 21.8425 6.08676 21.9 6.20495C22.6283 7.69786 23.0046 9.33788 23 10.999ZM3 10.999V13.999C3 14.2642 2.89464 14.5185 2.70711 14.7061C2.51957 14.8936 2.26522 14.999 2 14.999C1.73478 14.999 1.48043 14.8936 1.29289 14.7061C1.10536 14.5185 1 14.2642 1 13.999V10.999C1.00344 8.08263 2.16347 5.28673 4.22563 3.22458C6.28778 1.16242 9.08367 0.00239289 12 -0.00104758C14.3812 -0.00833344 16.6994 0.764374 18.6 2.19895C18.8122 2.35808 18.9524 2.59498 18.99 2.85753C19.0275 3.12008 18.9591 3.38678 18.8 3.59895C18.6409 3.81113 18.404 3.9514 18.1414 3.9889C17.8789 4.02641 17.6122 3.95808 17.4 3.79895C15.8452 2.62473 13.9484 1.99246 12 1.99895C9.61386 2.0016 7.32622 2.95066 5.63896 4.63792C3.95171 6.32517 3.00265 8.61282 3 10.999Z"
-                                          fill={
-                                            Object {
-                                              "type": 2,
-                                            }
-                                          }
-                                          fillRule={0}
-                                          propList={
-                                            Array [
-                                              "fill",
-                                              "fillRule",
-                                            ]
-                                          }
-                                        />
-                                      </RNSVGGroup>
-                                    </RNSVGSvgView>
-                                    <View
-                                      style={
-                                        Object {
-                                          "width": 24,
-                                        }
-                                      }
-                                    />
-                                    <View
-                                      style={
-                                        Object {
-                                          "flexShrink": 1,
-                                        }
-                                      }
-                                    >
-                                      <Text
-                                        allowFontScaling={false}
-                                        color="grey-700"
-                                        defaultColor="bluegrey"
-                                        defaultWeight="Regular"
-                                        font="TitilliumSansPro"
-                                        fontStyle={
-                                          Object {
-                                            "fontSize": 16,
-                                            "lineHeight": 24,
-                                          }
-                                        }
-                                        style={
-                                          Array [
-                                            Object {
-                                              "fontSize": 16,
-                                              "lineHeight": 24,
-                                            },
-                                            Object {
-                                              "color": "#555C70",
-                                              "fontFamily": "Titillium Sans Pro",
-                                              "fontStyle": "normal",
-                                              "fontWeight": "400",
-                                            },
-                                          ]
-                                        }
-                                        testID="infoScreenBody"
-                                        weight="Regular"
-                                      >
-                                        Do not share your unlock code or biometric recognition with anyone.
-                                      </Text>
-                                    </View>
-                                  </View>
-                                  <View
-                                    style={
-                                      Object {
-                                        "height": 24,
-                                      }
-                                    }
-                                  />
-                                  <View
-                                    style={
-                                      Array [
-                                        Object {
-                                          "flex": 1,
-                                        },
-                                        Object {
-                                          "flexDirection": "row",
-                                        },
-                                        Object {
-                                          "alignItems": "center",
-                                        },
-                                      ]
-                                    }
-                                  >
-                                    <RNSVGSvgView
-                                      accessibilityElementsHidden={true}
-                                      accessibilityLabel=""
-                                      accessible={false}
-                                      align="xMidYMid"
-                                      bbHeight={24}
-                                      bbWidth={24}
-                                      focusable={false}
-                                      height={24}
-                                      importantForAccessibility="no-hide-descendants"
-                                      meetOrSlice={0}
-                                      minX={0}
-                                      minY={0}
-                                      style={
-                                        Array [
-                                          Object {
-                                            "backgroundColor": "transparent",
-                                            "borderWidth": 0,
-                                          },
-                                          Object {
-                                            "color": "#BBC2D6",
-                                          },
-                                          Object {
-                                            "flex": 0,
-                                            "height": 24,
-                                            "width": 24,
-                                          },
-                                        ]
-                                      }
-                                      tintColor="#BBC2D6"
-                                      vbHeight={24}
-                                      vbWidth={24}
-                                      width={24}
-                                    >
-                                      <RNSVGGroup
-                                        fill={
-                                          Object {
-                                            "payload": 4278190080,
-                                            "type": 0,
-                                          }
-                                        }
-                                      >
-                                        <RNSVGPath
-                                          d="M17.661 18.7687c-.4242-.3536-.4816-.9841-.128-1.4084l3.6465-4.3758c-.0581.0105-.118.016-.1791.016H9.00041c-.55228 0-1-.4477-1-1s.44772-1 1-1H21.0004c.0612 0 .121.0055.1791.016L17.533 6.64065c-.3536-.42428-.2962-1.05484.128-1.40841.4243-.35356 1.0549-.29624 1.4084.12804l4.4666 5.35982c.618.7417.618 1.819 0 2.5607l-4.4666 5.3598c-.3535.4243-.9841.4816-1.4084.1281Zm-1.6679 5.2318c.5523.004 1.0032-.4404 1.0073-.9927.004-.5523-.4404-1.0032-.9927-1.0073l-11.02925-.0807c-1.64824-.0121-2.97804-1.3517-2.97804-3V5.00049c0-1.65686 1.34315-3 3-3H16.0004c.5523 0 1-.44772 1-1 0-.55229-.4477-1-1-1H5.00041c-2.76142 0-5 2.23857-5 5V18.9198c0 2.7472 2.21633 4.9798 4.9634 4.9999l11.02929.0808Z"
-                                          fill={
-                                            Object {
-                                              "type": 2,
-                                            }
-                                          }
-                                          propList={
-                                            Array [
-                                              "fill",
-                                            ]
-                                          }
-                                        />
-                                      </RNSVGGroup>
-                                    </RNSVGSvgView>
-                                    <View
-                                      style={
-                                        Object {
-                                          "width": 24,
-                                        }
-                                      }
-                                    />
-                                    <View
-                                      style={
-                                        Object {
-                                          "flexShrink": 1,
-                                        }
-                                      }
-                                    >
-                                      <Text
-                                        allowFontScaling={false}
-                                        color="grey-700"
-                                        defaultColor="bluegrey"
-                                        defaultWeight="Regular"
-                                        font="TitilliumSansPro"
-                                        fontStyle={
-                                          Object {
-                                            "fontSize": 16,
-                                            "lineHeight": 24,
-                                          }
-                                        }
-                                        style={
-                                          Array [
-                                            Object {
-                                              "fontSize": 16,
-                                              "lineHeight": 24,
-                                            },
-                                            Object {
-                                              "color": "#555C70",
-                                              "fontFamily": "Titillium Sans Pro",
-                                              "fontStyle": "normal",
-                                              "fontWeight": "400",
-                                            },
-                                          ]
-                                        }
-                                        testID="infoScreenBody"
-                                        weight="Regular"
-                                      >
-                                        If you lose your device, log out from the web.
-                                      </Text>
-                                      <View
-                                        style={
-                                          Object {
-                                            "height": 4,
-                                          }
-                                        }
-                                      />
-                                      <Text
-                                        accessibilityRole="link"
-                                        allowFontScaling={false}
-                                        color="blue"
-                                        defaultColor="blue"
-                                        defaultWeight="Semibold"
-                                        font="TitilliumSansPro"
-                                        fontSize="regular"
-                                        fontStyle={
-                                          Object {
-                                            "fontSize": 16,
-                                            "lineHeight": 24,
-                                            "textDecorationLine": "underline",
-                                          }
-                                        }
-                                        onPress={[Function]}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "fontSize": 16,
-                                              "lineHeight": 24,
-                                              "textDecorationLine": "underline",
-                                            },
-                                            Object {
-                                              "color": "#0073E6",
-                                              "fontFamily": "Titillium Sans Pro",
-                                              "fontStyle": "normal",
-                                              "fontWeight": "600",
-                                            },
-                                          ]
-                                        }
-                                        weight="Semibold"
-                                      >
-                                        Go to website
-                                      </Text>
-                                    </View>
-                                  </View>
-                                  <View
-                                    style={
-                                      Object {
-                                        "height": 24,
-                                      }
-                                    }
-                                  />
-                                  <View
-                                    style={
-                                      Array [
-                                        Object {
-                                          "flex": 1,
-                                        },
-                                        Object {
-                                          "flexDirection": "row",
-                                        },
-                                        Object {
-                                          "alignItems": "center",
-                                        },
-                                      ]
-                                    }
-                                  >
-                                    <RNSVGSvgView
-                                      accessibilityElementsHidden={true}
-                                      accessibilityLabel=""
-                                      accessible={false}
-                                      align="xMidYMid"
-                                      bbHeight={24}
-                                      bbWidth={24}
-                                      focusable={false}
-                                      height={24}
-                                      importantForAccessibility="no-hide-descendants"
-                                      meetOrSlice={0}
-                                      minX={0}
-                                      minY={0}
-                                      style={
-                                        Array [
-                                          Object {
-                                            "backgroundColor": "transparent",
-                                            "borderWidth": 0,
-                                          },
-                                          Object {
-                                            "color": "#BBC2D6",
-                                          },
-                                          Object {
-                                            "flex": 0,
-                                            "height": 24,
-                                            "width": 24,
-                                          },
-                                        ]
-                                      }
-                                      tintColor="#BBC2D6"
-                                      vbHeight={24}
-                                      vbWidth={24}
-                                      width={24}
-                                    >
-                                      <RNSVGGroup
-                                        fill={
-                                          Object {
-                                            "payload": 4278190080,
-                                            "type": 0,
-                                          }
-                                        }
-                                      >
-                                        <RNSVGPath
-                                          clipRule={0}
-                                          d="M6 6a6 6 0 1 1 12 0v2.416c1.766.772 3 2.534 3 4.584v6a5 5 0 0 1-5 5H8a5 5 0 0 1-5-5v-6a5.001 5.001 0 0 1 3-4.584V6Zm10 0v2H8V6a4 4 0 1 1 8 0Zm-8 4a3 3 0 0 0-3 3v6a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3v-6a3 3 0 0 0-3-3H8Zm4 4a1 1 0 0 0-1 1v2a1 1 0 1 0 2 0v-2a1 1 0 0 0-1-1Z"
-                                          fill={
-                                            Object {
-                                              "type": 2,
-                                            }
-                                          }
-                                          fillRule={0}
-                                          propList={
-                                            Array [
-                                              "fill",
-                                              "fillRule",
-                                            ]
-                                          }
-                                        />
-                                      </RNSVGGroup>
-                                    </RNSVGSvgView>
-                                    <View
-                                      style={
-                                        Object {
-                                          "width": 24,
-                                        }
-                                      }
-                                    />
-                                    <View
-                                      style={
-                                        Object {
-                                          "flexShrink": 1,
-                                        }
-                                      }
-                                    >
-                                      <Text
-                                        allowFontScaling={false}
-                                        color="grey-700"
-                                        defaultColor="bluegrey"
-                                        defaultWeight="Regular"
-                                        font="TitilliumSansPro"
-                                        fontStyle={
-                                          Object {
-                                            "fontSize": 16,
-                                            "lineHeight": 24,
-                                          }
-                                        }
-                                        style={
-                                          Array [
-                                            Object {
-                                              "fontSize": 16,
-                                              "lineHeight": 24,
-                                            },
-                                            Object {
-                                              "color": "#555C70",
-                                              "fontFamily": "Titillium Sans Pro",
-                                              "fontStyle": "normal",
-                                              "fontWeight": "400",
-                                            },
-                                          ]
-                                        }
-                                        testID="infoScreenBody"
-                                        weight="Regular"
-                                      >
-                                        If you fear that someone might use your SPID or CIE, lock access to the app after authenticating from the web.
-                                      </Text>
-                                      <View
-                                        style={
-                                          Object {
-                                            "height": 4,
-                                          }
-                                        }
-                                      />
-                                      <Text
-                                        accessibilityRole="link"
-                                        allowFontScaling={false}
-                                        color="blue"
-                                        defaultColor="blue"
-                                        defaultWeight="Semibold"
-                                        font="TitilliumSansPro"
-                                        fontSize="regular"
-                                        fontStyle={
-                                          Object {
-                                            "fontSize": 16,
-                                            "lineHeight": 24,
-                                            "textDecorationLine": "underline",
-                                          }
-                                        }
-                                        onPress={[Function]}
-                                        style={
-                                          Array [
-                                            Object {
-                                              "fontSize": 16,
-                                              "lineHeight": 24,
-                                              "textDecorationLine": "underline",
-                                            },
-                                            Object {
-                                              "color": "#0073E6",
-                                              "fontFamily": "Titillium Sans Pro",
-                                              "fontStyle": "normal",
-                                              "fontWeight": "600",
-                                            },
-                                          ]
-                                        }
-                                        weight="Semibold"
-                                      >
-                                        Go to website
-                                      </Text>
-                                    </View>
-                                  </View>
-                                  <View
-                                    style={
-                                      Object {
-                                        "height": 24,
-                                      }
-                                    }
-                                  />
-                                  <View
-                                    style={
-                                      Array [
-                                        Object {
-                                          "flex": 1,
-                                        },
-                                        Object {
-                                          "flexDirection": "row",
-                                        },
-                                        Object {
-                                          "alignItems": "center",
-                                        },
-                                      ]
-                                    }
-                                  >
-                                    <RNSVGSvgView
-                                      accessibilityElementsHidden={true}
-                                      accessibilityLabel=""
-                                      accessible={false}
-                                      align="xMidYMid"
-                                      bbHeight={24}
-                                      bbWidth={24}
-                                      focusable={false}
-                                      height={24}
-                                      importantForAccessibility="no-hide-descendants"
-                                      meetOrSlice={0}
-                                      minX={0}
-                                      minY={0}
-                                      style={
-                                        Array [
-                                          Object {
-                                            "backgroundColor": "transparent",
-                                            "borderWidth": 0,
-                                          },
-                                          Object {
-                                            "color": "#BBC2D6",
-                                          },
-                                          Object {
-                                            "flex": 0,
-                                            "height": 24,
-                                            "width": 24,
-                                          },
-                                        ]
-                                      }
-                                      tintColor="#BBC2D6"
-                                      vbHeight={24}
-                                      vbWidth={24}
-                                      width={24}
-                                    >
-                                      <RNSVGGroup
-                                        fill={
-                                          Object {
-                                            "payload": 4278190080,
-                                            "type": 0,
-                                          }
-                                        }
-                                      >
-                                        <RNSVGPath
-                                          d="M9 0C6.23858 0 4 2.23858 4 5v14c0 2.7614 2.23858 5 5 5h6c2.7614 0 5-2.2386 5-5V5c0-2.76142-2.2386-5-5-5H9ZM6 5c0-1.65685 1.34315-3 3-3h6c1.6569 0 3 1.34315 3 3v14c0 1.6569-1.3431 3-3 3H9c-1.65685 0-3-1.3431-3-3V5Zm6 15c.5523 0 1-.4477 1-1s-.4477-1-1-1-1 .4477-1 1 .4477 1 1 1Z"
-                                          fill={
-                                            Object {
-                                              "type": 2,
-                                            }
-                                          }
-                                          propList={
-                                            Array [
-                                              "fill",
-                                            ]
-                                          }
-                                        />
-                                      </RNSVGGroup>
-                                    </RNSVGSvgView>
-                                    <View
-                                      style={
-                                        Object {
-                                          "width": 24,
-                                        }
-                                      }
-                                    />
-                                    <View
-                                      style={
-                                        Object {
-                                          "flexShrink": 1,
-                                        }
-                                      }
-                                    >
-                                      <Text
-                                        allowFontScaling={false}
-                                        color="grey-700"
-                                        defaultColor="bluegrey"
-                                        defaultWeight="Regular"
-                                        font="TitilliumSansPro"
-                                        fontStyle={
-                                          Object {
-                                            "fontSize": 16,
-                                            "lineHeight": 24,
-                                          }
-                                        }
-                                        style={
-                                          Array [
-                                            Object {
-                                              "fontSize": 16,
-                                              "lineHeight": 24,
-                                            },
-                                            Object {
-                                              "color": "#555C70",
-                                              "fontFamily": "Titillium Sans Pro",
-                                              "fontStyle": "normal",
-                                              "fontWeight": "400",
-                                            },
-                                          ]
-                                        }
-                                        testID="infoScreenBody"
-                                        weight="Regular"
-                                      >
-                                        If you access IO with someone else's device, remember to log out when you are finished.
-                                      </Text>
-                                    </View>
-                                  </View>
-                                  <View
-                                    style={
-                                      Object {
-                                        "height": 24,
-                                      }
-                                    }
-                                  />
-                                </View>
-                              </View>
-                            </View>
-                          </RCTScrollView>
-                        </Modal>
+                          This is a mock for Security Suggestions
+                        </View>
                       </View>
                     </View>
                   </View>
diff --git a/ts/features/messages/store/actions/archiving.ts b/ts/features/messages/store/actions/archiving.ts
new file mode 100644
index 00000000000..b9494a0c8c5
--- /dev/null
+++ b/ts/features/messages/store/actions/archiving.ts
@@ -0,0 +1,27 @@
+import { createStandardAction } from "typesafe-actions";
+import { UIMessageId } from "../../types";
+import { ProcessingResult } from "../reducers/archiving";
+
+type ScheduleMessageArchivingType = {
+  fromInboxToArchive: boolean;
+  messageId: UIMessageId;
+};
+
+export const toggleScheduledMessageArchivingAction = createStandardAction(
+  "TOGGLE_SCHEDULED_MESSAGE_ARCHIVING"
+)<ScheduleMessageArchivingType>();
+
+export const removeScheduledMessageArchivingAction = createStandardAction(
+  "REMOVE_SCHEDULED_MESSAGE_ARCHIVING"
+)<ScheduleMessageArchivingType>();
+
+export const resetMessageArchivingAction = createStandardAction(
+  "RESET_MESSAGE_ARCHIVING_SCHEDULE"
+)<ProcessingResult | undefined>();
+
+export const startProcessingMessageArchivingAction = createStandardAction(
+  "START_PROCESSING_MESSAGE_ARCHIVING_ACTION"
+)<void>();
+export const interruptMessageArchivingProcessingAction = createStandardAction(
+  "INTERRUPT_MESSAGE_ARCHIVING_PROCESSING"
+)<ProcessingResult | undefined>();
diff --git a/ts/features/messages/store/actions/index.ts b/ts/features/messages/store/actions/index.ts
index fe7feafb4ee..16a8cff2b6b 100644
--- a/ts/features/messages/store/actions/index.ts
+++ b/ts/features/messages/store/actions/index.ts
@@ -24,6 +24,13 @@ import {
   shownPreconditionStatusAction,
   updateRequiredPreconditionStatusAction
 } from "./preconditions";
+import {
+  resetMessageArchivingAction,
+  interruptMessageArchivingProcessingAction,
+  removeScheduledMessageArchivingAction,
+  startProcessingMessageArchivingAction,
+  toggleScheduledMessageArchivingAction
+} from "./archiving";
 
 export type ThirdPartyMessageActions = ActionType<typeof loadThirdPartyMessage>;
 
@@ -339,4 +346,9 @@ export type MessagesActions = ActionType<
   | typeof cancelQueuedPaymentUpdates
   | typeof addUserSelectedPaymentRptId
   | typeof setShownMessageCategoryAction
+  | typeof toggleScheduledMessageArchivingAction
+  | typeof resetMessageArchivingAction
+  | typeof startProcessingMessageArchivingAction
+  | typeof removeScheduledMessageArchivingAction
+  | typeof interruptMessageArchivingProcessingAction
 >;
diff --git a/ts/features/messages/store/reducers/allPaginated.ts b/ts/features/messages/store/reducers/allPaginated.ts
index 89a1ef1b715..6eaa500f526 100644
--- a/ts/features/messages/store/reducers/allPaginated.ts
+++ b/ts/features/messages/store/reducers/allPaginated.ts
@@ -1,6 +1,6 @@
 import * as pot from "@pagopa/ts-commons/lib/pot";
 import { constFalse, constUndefined, pipe } from "fp-ts/lib/function";
-import * as B from "fp-ts/lib/boolean";
+import * as RA from "fp-ts/lib/ReadonlyArray";
 import * as O from "fp-ts/lib/Option";
 import * as E from "fp-ts/lib/Either";
 import { getType } from "typesafe-actions";
@@ -22,13 +22,12 @@ import {
 import { clearCache } from "../../../../store/actions/profile";
 import { Action } from "../../../../store/actions/types";
 import { GlobalState } from "../../../../store/reducers/types";
-import { UIMessage } from "../../types";
+import { UIMessage, UIMessageId } from "../../types";
 import { foldK, isSomeLoadingOrSomeUpdating } from "../../../../utils/pot";
 import { emptyMessageArray } from "../../utils";
 import { MessageCategory } from "../../../../../definitions/backend/MessageCategory";
 import { foldMessageCategoryK } from "../../utils/messageCategory";
 import { paymentsByRptIdSelector } from "../../../../store/reducers/entities/payments";
-import { TranslationKeys } from "../../../../../locales/locales";
 
 export type MessagePage = {
   page: ReadonlyArray<UIMessage>;
@@ -875,54 +874,6 @@ const reasonFromMessagePageContainer = (
   container: MessagePage
 ): "notEmpty" | "noData" => (container.page.length > 0 ? "notEmpty" : "noData");
 
-export const latestMessageOperationTranslationKeySelector = (
-  state: GlobalState
-): TranslationKeys | undefined =>
-  pipe(
-    state.entities.messages.allPaginated.latestMessageOperation,
-    O.fromNullable,
-    O.map(latestMessageOperation =>
-      pipe(
-        latestMessageOperation,
-        E.fold(
-          failure =>
-            pipe(
-              failure.operation === "archive",
-              B.fold(
-                () => "messages.operations.restore.failure" as const,
-                () => "messages.operations.archive.failure" as const
-              )
-            ),
-          successOperation =>
-            pipe(
-              successOperation === "archive",
-              B.fold(
-                () => "messages.operations.restore.success" as const,
-                () => "messages.operations.archive.success" as const
-              )
-            )
-        )
-      )
-    ),
-    O.toUndefined
-  );
-
-export const latestMessageOperationToastTypeSelector = (state: GlobalState) =>
-  pipe(
-    state.entities.messages.allPaginated.latestMessageOperation,
-    O.fromNullable,
-    O.map(latestMessageOperation =>
-      pipe(
-        latestMessageOperation,
-        E.fold(
-          _ => "error" as const,
-          _ => "success" as const
-        )
-      )
-    ),
-    O.toUndefined
-  );
-
 export const inboxMessagesErrorReasonSelector = (state: GlobalState) =>
   pipe(
     state.entities.messages.allPaginated.inbox.data,
@@ -935,6 +886,20 @@ export const archiveMessagesErrorReasonSelector = (state: GlobalState) =>
     messagePotToToastReportableErrorOrUndefined
   );
 
+export const paginatedMessageFromIdForCategorySelector = (
+  state: GlobalState,
+  messageId: UIMessageId,
+  category: MessageListCategory
+) =>
+  pipe(
+    state,
+    messagePagePotFromCategorySelector(category),
+    pot.toOption,
+    O.map(messagePage => messagePage.page),
+    O.chain(RA.findFirst(message => message.id === messageId)),
+    O.toUndefined
+  );
+
 const messagePotToToastReportableErrorOrUndefined = (
   messagePagePot: MessagePagePot
 ) =>
diff --git a/ts/features/messages/store/reducers/archiving.ts b/ts/features/messages/store/reducers/archiving.ts
new file mode 100644
index 00000000000..2fc50d71b19
--- /dev/null
+++ b/ts/features/messages/store/reducers/archiving.ts
@@ -0,0 +1,157 @@
+import { pipe } from "fp-ts/lib/function";
+import { getType } from "typesafe-actions";
+import { Action } from "../../../../store/actions/types";
+import { UIMessageId } from "../../types";
+import {
+  resetMessageArchivingAction,
+  interruptMessageArchivingProcessingAction,
+  removeScheduledMessageArchivingAction,
+  startProcessingMessageArchivingAction,
+  toggleScheduledMessageArchivingAction
+} from "../actions/archiving";
+import { duplicateSetAndRemove, duplicateSetAndToggle } from "../../utils";
+import { GlobalState } from "../../../../store/reducers/types";
+import { MessageListCategory } from "../../types/messageListCategory";
+
+type ArchivingStatus = "disabled" | "enabled" | "processing";
+
+export type ProcessingResult = {
+  type: "success" | "warning" | "error";
+  reason: string;
+};
+
+export type Archiving = {
+  fromArchiveToInbox: Set<UIMessageId>;
+  fromInboxToArchive: Set<UIMessageId>;
+  processingResult: ProcessingResult | undefined;
+  status: ArchivingStatus;
+};
+
+export const INITIAL_STATE: Archiving = {
+  fromArchiveToInbox: new Set<UIMessageId>(),
+  fromInboxToArchive: new Set<UIMessageId>(),
+  processingResult: undefined,
+  status: "disabled"
+};
+
+export const archivingReducer = (
+  state: Archiving = INITIAL_STATE,
+  action: Action
+): Archiving => {
+  switch (action.type) {
+    case getType(toggleScheduledMessageArchivingAction): {
+      if (state.status === "processing") {
+        return state;
+      }
+      if (action.payload.fromInboxToArchive) {
+        return {
+          ...state,
+          status: "enabled",
+          fromInboxToArchive: duplicateSetAndToggle(
+            state.fromInboxToArchive,
+            action.payload.messageId
+          )
+        };
+      }
+      return {
+        ...state,
+        status: "enabled",
+        fromArchiveToInbox: duplicateSetAndToggle(
+          state.fromArchiveToInbox,
+          action.payload.messageId
+        )
+      };
+    }
+    case getType(resetMessageArchivingAction): {
+      return { ...INITIAL_STATE, processingResult: action.payload };
+    }
+    case getType(startProcessingMessageArchivingAction): {
+      return {
+        ...state,
+        processingResult: undefined,
+        status: "processing"
+      };
+    }
+    case getType(removeScheduledMessageArchivingAction): {
+      if (action.payload.fromInboxToArchive) {
+        return {
+          ...state,
+          fromInboxToArchive: duplicateSetAndRemove(
+            state.fromInboxToArchive,
+            action.payload.messageId
+          )
+        };
+      }
+      return {
+        ...state,
+        fromArchiveToInbox: duplicateSetAndRemove(
+          state.fromArchiveToInbox,
+          action.payload.messageId
+        )
+      };
+    }
+    case getType(interruptMessageArchivingProcessingAction): {
+      if (state.status === "processing") {
+        return {
+          ...state,
+          processingResult: action.payload,
+          status: "enabled"
+        };
+      }
+      return state;
+    }
+  }
+  return state;
+};
+
+export const isArchivingDisabledSelector = (state: GlobalState) =>
+  state.entities.messages.archiving.status === "disabled";
+export const isArchivingInSchedulingModeSelector = (state: GlobalState) =>
+  state.entities.messages.archiving.status === "enabled";
+export const isArchivingInProcessingModeSelector = (state: GlobalState) =>
+  state.entities.messages.archiving.status === "processing";
+export const isMessageScheduledForArchivingSelector = (
+  state: GlobalState,
+  messageId: UIMessageId
+) =>
+  pipe(
+    state.entities.messages.archiving,
+    archiving =>
+      archiving.status !== "disabled" &&
+      (archiving.fromArchiveToInbox.has(messageId) ||
+        archiving.fromInboxToArchive.has(messageId))
+  );
+export const areThereEntriesForShownMessageListCategorySelector = (
+  state: GlobalState,
+  category: MessageListCategory
+) =>
+  pipe(
+    state.entities.messages.archiving,
+    archiving =>
+      category === "ARCHIVE"
+        ? archiving.fromArchiveToInbox
+        : archiving.fromInboxToArchive,
+    scheduledMessageSet => scheduledMessageSet.size > 0
+  );
+export const nextQueuedMessageDataUncachedSelector = (state: GlobalState) => {
+  const archiving = state.entities.messages.archiving;
+
+  if (archiving.fromInboxToArchive.size > 0) {
+    const messageIds = [...archiving.fromInboxToArchive];
+    return {
+      messageId: messageIds[0],
+      archiving: true
+    };
+  } else if (archiving.fromArchiveToInbox.size > 0) {
+    const messageIds = [...archiving.fromArchiveToInbox];
+    return {
+      messageId: messageIds[0],
+      archiving: false
+    };
+  }
+  return undefined;
+};
+export const processingResultTypeSelector = (state: GlobalState) =>
+  state.entities.messages.archiving.processingResult?.type;
+export const processingResultReasonSelector = (state: GlobalState) =>
+  state.entities.messages.archiving.processingResult?.reason;
diff --git a/ts/features/messages/store/reducers/index.ts b/ts/features/messages/store/reducers/index.ts
index 550309123ab..df157726a97 100644
--- a/ts/features/messages/store/reducers/index.ts
+++ b/ts/features/messages/store/reducers/index.ts
@@ -1,11 +1,5 @@
-/**
- * Messages combined reducer
- */
-
 import { combineReducers } from "redux";
-
 import { Action } from "../../../../store/actions/types";
-
 import allPaginatedReducer, { AllPaginated } from "./allPaginated";
 import { DetailsById, detailsByIdReducer } from "./detailsById";
 import paginatedByIdReducer, { PaginatedById } from "./paginatedById";
@@ -21,29 +15,32 @@ import {
   MessagePreconditionStatus,
   preconditionReducer
 } from "./messagePrecondition";
+import { Archiving, archivingReducer } from "./archiving";
 
 export type MessagesState = Readonly<{
   allPaginated: AllPaginated;
-  paginatedById: PaginatedById;
+  archiving: Archiving;
   detailsById: DetailsById;
-  thirdPartyById: ThirdPartyById;
   downloads: Downloads;
   legacyMessagePrecondition: LegacyMessagePrecondition;
   messageGetStatus: MessageGetStatus;
+  paginatedById: PaginatedById;
   payments: MultiplePaymentState;
   precondition: MessagePreconditionStatus;
+  thirdPartyById: ThirdPartyById;
 }>;
 
 const reducer = combineReducers<MessagesState, Action>({
   allPaginated: allPaginatedReducer,
-  paginatedById: paginatedByIdReducer,
+  archiving: archivingReducer,
   detailsById: detailsByIdReducer,
-  thirdPartyById: thirdPartyByIdReducer,
   downloads: downloadsReducer,
   legacyMessagePrecondition: legacyMessagePreconditionReducer,
   messageGetStatus: messageGetStatusReducer,
+  paginatedById: paginatedByIdReducer,
   payments: paymentsReducer,
-  precondition: preconditionReducer
+  precondition: preconditionReducer,
+  thirdPartyById: thirdPartyByIdReducer
 });
 
 export default reducer;
diff --git a/ts/features/messages/utils/index.ts b/ts/features/messages/utils/index.ts
index cdb8ce4304d..a4c38f6b23f 100644
--- a/ts/features/messages/utils/index.ts
+++ b/ts/features/messages/utils/index.ts
@@ -137,4 +137,9 @@ export const duplicateSetAndRemove = <T>(inputSet: Set<T>, item: T) => {
   return outputSet;
 };
 
+export const duplicateSetAndToggle = <A>(inputSet: Set<A>, id: A) =>
+  inputSet.has(id)
+    ? duplicateSetAndRemove(inputSet, id)
+    : duplicateSetAndAdd(inputSet, id);
+
 export const emptyMessageArray: ReadonlyArray<UIMessage> = [];
diff --git a/ts/features/pn/screens/LegacyAttachmentPreviewScreen.tsx b/ts/features/pn/screens/LegacyAttachmentPreviewScreen.tsx
index 98611b7ce96..c11f03c4d98 100644
--- a/ts/features/pn/screens/LegacyAttachmentPreviewScreen.tsx
+++ b/ts/features/pn/screens/LegacyAttachmentPreviewScreen.tsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useRef } from "react";
 import { pipe } from "fp-ts/lib/function";
 import * as B from "fp-ts/lib/boolean";
-import * as O from "fp-ts/lib/Option";
 import { PnParamsList } from "../navigation/params";
 import { IOStackNavigationRouteProps } from "../../../navigation/params/AppParamsList";
 import { useIOSelector } from "../../../store/hooks";
@@ -29,54 +28,54 @@ export const LegacyAttachmentPreviewScreen = ({
   // This ref is needed otherwise the auto back on the useEffect will fire multiple
   // times, since its dependencies change during the back navigation
   const autoBackOnErrorHandled = useRef(false);
-  const maybePnMessageAttachment = useIOSelector(state =>
+  const pnMessageAttachmentOrUndefined = useIOSelector(state =>
     pnMessageAttachmentSelector(state)(messageId)(attachmentId)
   );
 
   useEffect(() => {
     // This condition happens only if this screen is shown without having
     // first retrieved the third party message (so it should never happen)
-    if (!autoBackOnErrorHandled.current && O.isNone(maybePnMessageAttachment)) {
+    if (!autoBackOnErrorHandled.current && !pnMessageAttachmentOrUndefined) {
       // eslint-disable-next-line functional/immutable-data
       autoBackOnErrorHandled.current = true;
       navigation.goBack();
     }
-  }, [maybePnMessageAttachment, navigation]);
+  }, [pnMessageAttachmentOrUndefined, navigation]);
 
-  return O.isSome(maybePnMessageAttachment) ? (
+  return pnMessageAttachmentOrUndefined ? (
     <LegacyMessageAttachmentPreview
       messageId={messageId}
       enableDownloadAttachment={false}
-      attachment={maybePnMessageAttachment.value}
+      attachment={pnMessageAttachmentOrUndefined}
       onOpen={() =>
-        trackPNAttachmentOpen(maybePnMessageAttachment.value.category)
+        trackPNAttachmentOpen(pnMessageAttachmentOrUndefined.category)
       }
       onShare={() =>
         pipe(
           isIos,
           B.fold(
             () =>
-              trackPNAttachmentShare(maybePnMessageAttachment.value.category),
+              trackPNAttachmentShare(pnMessageAttachmentOrUndefined.category),
             () =>
               trackPNAttachmentSaveShare(
-                maybePnMessageAttachment.value.category
+                pnMessageAttachmentOrUndefined.category
               )
           )
         )
       }
       onDownload={() =>
-        trackPNAttachmentSave(maybePnMessageAttachment.value.category)
+        trackPNAttachmentSave(pnMessageAttachmentOrUndefined.category)
       }
       onLoadComplete={() =>
         trackPNAttachmentOpeningSuccess(
           "displayer",
-          maybePnMessageAttachment.value.category
+          pnMessageAttachmentOrUndefined.category
         )
       }
       onPDFError={() =>
         trackPNAttachmentOpeningSuccess(
           "error",
-          maybePnMessageAttachment.value.category
+          pnMessageAttachmentOrUndefined.category
         )
       }
     />
diff --git a/ts/features/pn/store/reducers/index.ts b/ts/features/pn/store/reducers/index.ts
index 59fc3d3f97f..831c5a45d42 100644
--- a/ts/features/pn/store/reducers/index.ts
+++ b/ts/features/pn/store/reducers/index.ts
@@ -41,7 +41,8 @@ export const pnMessageAttachmentSelector =
           pnMessageAttachment =>
             pnMessageAttachment.id === pnMessageAttachmentId
         )
-      )
+      ),
+      O.toUndefined
     );
 
 export const pnUserSelectedPaymentRptIdSelector = (
diff --git a/ts/features/pushNotifications/sagas/__tests__/notifications.test.ts b/ts/features/pushNotifications/sagas/__tests__/notifications.test.ts
index e20b2162631..b34a3165317 100644
--- a/ts/features/pushNotifications/sagas/__tests__/notifications.test.ts
+++ b/ts/features/pushNotifications/sagas/__tests__/notifications.test.ts
@@ -31,6 +31,8 @@ import { navigateToMainNavigatorAction } from "../../../../store/actions/navigat
 import { navigateToMessageRouterAction } from "../../../messages/store/actions/navigation";
 import { UIMessageId } from "../../../messages/types";
 import * as Analytics from "../../../messages/analytics";
+import { isArchivingDisabledSelector } from "../../../messages/store/reducers/archiving";
+import { resetMessageArchivingAction } from "../../../messages/store/actions/archiving";
 
 const installationId = "installationId";
 jest.mock("../../utils/index", () => ({
@@ -242,6 +244,8 @@ describe("handlePendingMessageStateIfAllowedSaga", () => {
       .next(false)
       .put(clearNotificationPendingMessage())
       .next()
+      .select(isArchivingDisabledSelector)
+      .next(true)
       .call(
         NavigationService.dispatchNavigationAction,
         dispatchNavigationActionParameter
@@ -268,6 +272,36 @@ describe("handlePendingMessageStateIfAllowedSaga", () => {
       .next()
       .call(navigateToMainNavigatorAction)
       .next()
+      .select(isArchivingDisabledSelector)
+      .next(true)
+      .call(
+        NavigationService.dispatchNavigationAction,
+        dispatchNavigationActionParameter
+      )
+      .next()
+      .isDone();
+  });
+
+  it("make the app navigate to the message detail when the user press on a notification, resetting the message archiving/restoring if such is disabled", () => {
+    const dispatchNavigationActionParameter = navigateToMessageRouterAction({
+      messageId: mockedPendingMessageState.id as UIMessageId,
+      fromNotification: true
+    });
+
+    testSaga(handlePendingMessageStateIfAllowedSaga, false)
+      .next()
+      .select(pendingMessageStateSelector)
+      .next(mockedPendingMessageState)
+      .call(trackMessageNotificationTapIfNeeded, mockedPendingMessageState)
+      .next()
+      .select(isPaymentOngoingSelector)
+      .next(false)
+      .put(clearNotificationPendingMessage())
+      .next()
+      .select(isArchivingDisabledSelector)
+      .next(false)
+      .put(resetMessageArchivingAction(undefined))
+      .next()
       .call(
         NavigationService.dispatchNavigationAction,
         dispatchNavigationActionParameter
diff --git a/ts/features/pushNotifications/sagas/notifications.ts b/ts/features/pushNotifications/sagas/notifications.ts
index 2b35f2f83ed..39529a1c06d 100644
--- a/ts/features/pushNotifications/sagas/notifications.ts
+++ b/ts/features/pushNotifications/sagas/notifications.ts
@@ -30,6 +30,8 @@ import {
   notificationsInstallationTokenRegistered,
   updateNotificationInstallationFailure
 } from "../store/actions/notifications";
+import { isArchivingDisabledSelector } from "../../messages/store/reducers/archiving";
+import { resetMessageArchivingAction } from "../../messages/store/actions/archiving";
 
 export const notificationsPlatform: PlatformEnum =
   Platform.select<PlatformEnum>({
@@ -122,6 +124,17 @@ export function* handlePendingMessageStateIfAllowedSaga(
       yield* call(navigateToMainNavigatorAction);
     }
 
+    // It the archiving/restoring of messages is not disabled, make
+    // sure to cancel it, whatever status it may be in (since it
+    // hides the bottom tab bar and we cannot trigger a navigation
+    // flow that may later deliver the user back to a main tab bar
+    // screen where such tab bar is hidden)
+    const isArchivingDisabled = yield* select(isArchivingDisabledSelector);
+    if (!isArchivingDisabled) {
+      // Auto-reset does not provide feedback to the user
+      yield* put(resetMessageArchivingAction(undefined));
+    }
+
     // Navigate to message router screen
     yield* call(
       NavigationService.dispatchNavigationAction,
diff --git a/ts/features/pushNotifications/utils/configurePushNotification.ts b/ts/features/pushNotifications/utils/configurePushNotification.ts
index e548431bdac..b9cde8e7a74 100644
--- a/ts/features/pushNotifications/utils/configurePushNotification.ts
+++ b/ts/features/pushNotifications/utils/configurePushNotification.ts
@@ -29,6 +29,7 @@ import {
   updateNotificationsPendingMessage
 } from "../store/actions/notifications";
 import { isLoadingOrUpdating } from "../../../utils/pot";
+import { isArchivingInProcessingModeSelector } from "../../messages/store/reducers/archiving";
 
 /**
  * Helper type used to validate the notification payload.
@@ -47,11 +48,15 @@ const NotificationPayload = t.partial({
  */
 function handleForegroundMessageReload() {
   const state = store.getState();
-  // Make sure there are not progressing message loadings
+  // Make sure there are not progressing message loadings and
+  // that the system is not processing any message archiving/restoring
   const allPaginated = state.entities.messages.allPaginated;
+  const isProcessingArchivingOrRestoring =
+    isArchivingInProcessingModeSelector(state);
   if (
     isLoadingOrUpdating(allPaginated.archive.data) ||
-    isLoadingOrUpdating(allPaginated.inbox.data)
+    isLoadingOrUpdating(allPaginated.inbox.data) ||
+    isProcessingArchivingOrRestoring
   ) {
     return;
   }
diff --git a/ts/navigation/AppStackNavigator.tsx b/ts/navigation/AppStackNavigator.tsx
index 95254755f17..93a0d2a5888 100644
--- a/ts/navigation/AppStackNavigator.tsx
+++ b/ts/navigation/AppStackNavigator.tsx
@@ -19,7 +19,7 @@ import UADONATION_ROUTES from "../features/uaDonations/navigation/routes";
 import { IngressScreen } from "../screens/ingress/IngressScreen";
 import { startApplicationInitialization } from "../store/actions/application";
 import { setDebugCurrentRouteName } from "../store/actions/debug";
-import { useIODispatch, useIOSelector } from "../store/hooks";
+import { useIODispatch, useIOSelector, useIOStore } from "../store/hooks";
 import { trackScreen } from "../store/middlewares/navigation";
 import {
   isCGNEnabledSelector,
@@ -45,6 +45,7 @@ import NavigationService, {
 import NotAuthenticatedStackNavigator from "./NotAuthenticatedStackNavigator";
 import { AppParamsList } from "./params/AppParamsList";
 import ROUTES from "./routes";
+import { linkingSubscription } from "./linkingSubscription";
 
 type OnStateChangeStateType = Parameters<
   NonNullable<NavigationContainerProps["onStateChange"]>
@@ -83,6 +84,7 @@ export const AppStackNavigator = (): React.ReactElement => {
 const InnerNavigationContainer = (props: { children: React.ReactElement }) => {
   const routeNameRef = useRef<string>();
   const dispatch = useIODispatch();
+  const store = useIOStore();
 
   const cgnEnabled = useIOSelector(isCGNEnabledSelector);
   const isFimsEnabled = useIOSelector(isFIMSEnabledSelector) && fimsEnabled;
@@ -146,7 +148,8 @@ const InnerNavigationContainer = (props: { children: React.ReactElement }) => {
         [UADONATION_ROUTES.WEBVIEW]: "uadonations-webview",
         [ROUTES.WORKUNIT_GENERIC_FAILURE]: "*"
       }
-    }
+    },
+    subscribe: linkingSubscription(dispatch, store)
   };
 
   return (
diff --git a/ts/navigation/components/HeaderFirstLevelHandler.tsx b/ts/navigation/components/HeaderFirstLevelHandler.tsx
index 1dc04f1c953..382cc26a806 100644
--- a/ts/navigation/components/HeaderFirstLevelHandler.tsx
+++ b/ts/navigation/components/HeaderFirstLevelHandler.tsx
@@ -1,7 +1,7 @@
 import { ActionProp, HeaderFirstLevel } from "@pagopa/io-app-design-system";
 import * as O from "fp-ts/lib/Option";
 import { pipe } from "fp-ts/lib/function";
-import React, { ComponentProps, useMemo } from "react";
+import React, { ComponentProps, useCallback, useMemo } from "react";
 import { useWalletHomeHeaderBottomSheet } from "../../components/wallet/WalletHomeHeader";
 import { MESSAGES_ROUTES } from "../../features/messages/navigation/routes";
 import {
@@ -10,13 +10,18 @@ import {
 } from "../../hooks/useStartSupportRequest";
 import I18n from "../../i18n";
 import { searchMessagesEnabled } from "../../store/actions/search";
-import { useIODispatch, useIOSelector } from "../../store/hooks";
+import { useIODispatch, useIOSelector, useIOStore } from "../../store/hooks";
 import { SERVICES_ROUTES } from "../../features/services/common/navigation/routes";
 import { MainTabParamsList } from "../params/MainTabParamsList";
 import ROUTES from "../routes";
 import { useIONavigation } from "../params/AppParamsList";
 import { isNewPaymentSectionEnabledSelector } from "../../store/reducers/backendStatus";
 import * as analytics from "../../features/services/common/analytics";
+import {
+  isArchivingInProcessingModeSelector,
+  isArchivingInSchedulingModeSelector
+} from "../../features/messages/store/reducers/archiving";
+import { resetMessageArchivingAction } from "../../features/messages/store/actions/archiving";
 
 type HeaderFirstLevelProps = ComponentProps<typeof HeaderFirstLevel>;
 type TabRoutes = keyof MainTabParamsList;
@@ -72,6 +77,7 @@ type Props = {
 export const HeaderFirstLevelHandler = ({ currentRouteName }: Props) => {
   const dispatch = useIODispatch();
   const navigation = useIONavigation();
+  const store = useIOStore();
 
   const isNewWalletSectionEnabled = useIOSelector(
     isNewPaymentSectionEnabledSelector
@@ -103,6 +109,26 @@ export const HeaderFirstLevelHandler = ({ currentRouteName }: Props) => {
     present: presentWalletHomeHeaderBottomsheet
   } = useWalletHomeHeaderBottomSheet();
 
+  const messageSearchCallback = useCallback(() => {
+    const state = store.getState();
+    // If the system is busy archiving or restoring messages, do not start a search
+    const isProcessingArchiveQueue = isArchivingInProcessingModeSelector(state);
+    if (isProcessingArchiveQueue) {
+      return;
+    }
+    // If the user was choosing which messages to archive/restore, disable it
+    // before starting the search, since the bottom tab bar is hidden and the
+    // search may trigger a navigation flow that leads back to another main
+    // screen tab details with no such tab bar shown
+    const isSchedulingArchiving = isArchivingInSchedulingModeSelector(state);
+    if (isSchedulingArchiving) {
+      // Auto-reset does not provide feedback to the user
+      dispatch(resetMessageArchivingAction(undefined));
+    }
+
+    dispatch(searchMessagesEnabled(true));
+  }, [dispatch, store]);
+
   const headerProps: HeaderFirstLevelProps = useMemo(() => {
     switch (currentRouteName) {
       case SERVICES_ROUTES.SERVICES_HOME:
@@ -170,9 +196,7 @@ export const HeaderFirstLevelHandler = ({ currentRouteName }: Props) => {
           secondAction: {
             icon: "search",
             accessibilityLabel: I18n.t("global.accessibility.search"),
-            onPress: () => {
-              dispatch(searchMessagesEnabled(true));
-            }
+            onPress: messageSearchCallback
           }
         };
     }
@@ -181,7 +205,7 @@ export const HeaderFirstLevelHandler = ({ currentRouteName }: Props) => {
     helpAction,
     presentWalletHomeHeaderBottomsheet,
     isNewWalletSectionEnabled,
-    dispatch,
+    messageSearchCallback,
     navigation
   ]);
 
diff --git a/ts/navigation/linkingSubscription.ts b/ts/navigation/linkingSubscription.ts
new file mode 100644
index 00000000000..89127c4d404
--- /dev/null
+++ b/ts/navigation/linkingSubscription.ts
@@ -0,0 +1,26 @@
+import { Linking } from "react-native";
+import { Action, Dispatch, Store } from "redux";
+import { GlobalState } from "../store/reducers/types";
+import { isArchivingDisabledSelector } from "../features/messages/store/reducers/archiving";
+import { resetMessageArchivingAction } from "../features/messages/store/actions/archiving";
+
+export const linkingSubscription =
+  (dispatch: Dispatch<Action>, store: Store<Readonly<GlobalState>>) =>
+  (listener: (url: string) => void) => {
+    const linkingSubscription = Linking.addEventListener("url", ({ url }) => {
+      // Message archiving/restoring hides the bottom tab bar so we must make
+      // sure that either it is disabled or we manually deactivate it, otherwise
+      // a deep link may initiate a navigation flow that will later deliver the
+      // user to a screen where the tab bar is hidden (while it should be shown)
+      const state = store.getState();
+      const isArchivingDisabled = isArchivingDisabledSelector(state);
+      if (!isArchivingDisabled) {
+        // Auto-reset does not provide feedback to the user
+        dispatch(resetMessageArchivingAction(undefined));
+      }
+      listener(url);
+    });
+    return () => {
+      linkingSubscription.remove();
+    };
+  };
diff --git a/ts/navigation/params/AppParamsList.ts b/ts/navigation/params/AppParamsList.ts
index 516dbbdf3f6..e449f937596 100644
--- a/ts/navigation/params/AppParamsList.ts
+++ b/ts/navigation/params/AppParamsList.ts
@@ -5,6 +5,7 @@ import {
   useNavigation
 } from "@react-navigation/native";
 import { StackNavigationProp } from "@react-navigation/stack";
+import { BottomTabNavigationProp } from "@react-navigation/bottom-tabs";
 import { CdcBonusRequestParamsList } from "../../features/bonus/cdc/navigation/params";
 import { CDC_ROUTES } from "../../features/bonus/cdc/navigation/routes";
 import {
@@ -151,6 +152,14 @@ export type IOStackNavigationProp<
   ParamList extends ParamListBase,
   RouteName extends keyof ParamList = string
 > = StackNavigationProp<AppParamsList & ParamList, RouteName>;
+export type IOTabNavigationProp<
+  ParamList extends ParamListBase,
+  RouteName extends keyof ParamList = string
+> = BottomTabNavigationProp<MainTabParamsList & ParamList, RouteName>;
 
 export const useIONavigation = () =>
   useNavigation<IOStackNavigationProp<AppParamsList, keyof AppParamsList>>();
+export const useIOTabNavigation = () =>
+  useNavigation<
+    IOTabNavigationProp<MainTabParamsList, keyof MainTabParamsList>
+  >();
diff --git a/ts/screens/profile/__test__/LanguagesPreferencesScreen.test.tsx b/ts/screens/profile/__test__/LanguagesPreferencesScreen.test.tsx
index 934f321dfce..9d4cdc62962 100644
--- a/ts/screens/profile/__test__/LanguagesPreferencesScreen.test.tsx
+++ b/ts/screens/profile/__test__/LanguagesPreferencesScreen.test.tsx
@@ -13,7 +13,8 @@ import { preferredLanguageSelector } from "../../../store/reducers/persistedPref
 // Mock the useIOSelector hook
 jest.mock("../../../store/hooks", () => ({
   useIOSelector: jest.fn(),
-  useIODispatch: jest.fn()
+  useIODispatch: jest.fn(),
+  useIOStore: jest.fn()
 }));
 
 describe("LanguagesPreferencesScreen", () => {
diff --git a/ts/utils/testWrapper.tsx b/ts/utils/testWrapper.tsx
index 0d7b91b2548..58bdf1bee41 100644
--- a/ts/utils/testWrapper.tsx
+++ b/ts/utils/testWrapper.tsx
@@ -3,6 +3,7 @@ import { render, RenderOptions } from "@testing-library/react-native";
 import React from "react";
 import { Provider } from "react-redux";
 import { Store } from "redux";
+import * as linkingSubscription from "../navigation/linkingSubscription";
 import { TestInnerNavigationContainer } from "../navigation/AppStackNavigator";
 
 /**
@@ -18,8 +19,12 @@ export const renderScreenWithNavigationStoreContext = <S,>(
   route: string,
   params: Record<string, any>,
   store: Store<S>,
-  renderOptions: RenderOptions = {}
+  renderOptions: RenderOptions = {},
+  mockLinkingSubscription = jest.fn()
 ) => {
+  jest
+    .spyOn(linkingSubscription, "linkingSubscription")
+    .mockImplementation(mockLinkingSubscription);
   const Stack = createStackNavigator();
   const component = (
     <Provider store={store}>