diff --git a/app/src/main/res/layout/dialog_delete_confirmation.xml b/app/src/main/res/layout/dialog_delete_confirmation.xml
deleted file mode 100644
index 4c7af316..00000000
--- a/app/src/main/res/layout/dialog_delete_confirmation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/delete_remember_holder"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/big_margin"
-    android:paddingTop="@dimen/big_margin"
-    android:paddingRight="@dimen/big_margin">
-
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/delete_remember_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/small_margin"
-        android:paddingBottom="@dimen/activity_margin"
-        android:text="@string/archive_whole_conversation_confirmation"
-        android:textSize="@dimen/bigger_text_size" />
-
-    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-        android:id="@+id/skip_the_archive_checkbox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/delete_remember_title"
-        android:text="@string/skip_archive" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 962e1b20..da39a093 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -59,19 +59,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">هل أنت متأكد أنك تريد حذف كافة رسائل هذه المحادثة؟</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="zero">محادثة %d</item>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 9dffb06f..baae62fa 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 5e3329a9..ec716674 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -57,19 +57,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Выдаліць усе паведамленні ў гэтай размове\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d размову</item>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index bd8dc30e..56888a75 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Сигурни ли сте, че искате да изтриете всички съобщения от този разговор\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d разговор</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 6a46a1ed..6aae4bf5 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Confirmeu que voleu suprimir tots els missatges d\'aquesta conversa\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversa</item>
diff --git a/app/src/main/res/values-cr/strings.xml b/app/src/main/res/values-cr/strings.xml
index 9dffb06f..baae62fa 100644
--- a/app/src/main/res/values-cr/strings.xml
+++ b/app/src/main/res/values-cr/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 807cc198..1e2cc871 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Opravdu chcete smazat všechny zprávy v této konverzaci\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d konverzace</item>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 11a76867..f0bf14a8 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Er du sikker på, at du vil slette alle beskeder i denne samtale\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d samtale</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5cd930f9..09c07e16 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Sollen wirklich alle Nachrichten dieser Unterhaltung gelöscht werden\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d Unterhaltung</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 417a31fb..36c3a5ba 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Είστε βέβαιοι ότι θέλετε να διαγράψετε όλα τα μηνύματα αυτής της συνομιλίας;</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d συνομιλία</item>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 224d2d3c..8fa801eb 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d konversacio</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fac0ba29..91a189be 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">¿Estás seguro que quieres eliminar todos los mensajes en esta conversación\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversación</item>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 20cbf975..a2bb14b4 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Kas oled kindel, et soovid kustutada kõik selle vestluse sõnumid\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d vestlus</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 7af8aabf..5d2c0ef8 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Haluatko varmasti poistaa kaikki tämän keskustelun viestit\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d keskustelu</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8b21c321..55dac3d4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Voulez-vous vraiment supprimer tous les messages de cette conversation \?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 19112f5e..03e87794 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Ten a certeza de que desexa eliminar todas as mensaxes desta conversa\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversa</item>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 9dffb06f..baae62fa 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index d2ff6d85..fd554454 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Vrati iz arhiva</string>
     <string name="empty_archive">Izbriši sve arhivirane razgovore</string>
-    <string name="skip_archive">Prekoči arhiv, obriši razgovore odmah</string>
     <string name="archived_conversations">Arhiv</string>
     <string name="show_archived_conversations">Prikaži arhivirane razgovore</string>
     <string name="archive">Arhiviraj</string>
     <string name="no_archived_conversations">Nema arhiviranih razgovora</string>
-    <string name="archive_instead_of_delete">Arhiviraj razgovore umjesto brisanja</string>
-    <string name="archive_is_empty">Arhiv je prazan</string>
     <string name="archive_emptied_successfully">Arhiv je uspješno ispražnjen</string>
     <string name="empty_archive_confirmation">Jeste li ste sigurni da želite isprazniti arhiv? Svi arhivirani razgovori će biti obrisani.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Stvarno želiš izbrisati sve poruke ovog razgovora\?</string>
-    <string name="archive_whole_conversation_confirmation">Stvarno želiš arhivirati ovaj razgovor?</string>
-    <string name="archive_confirmation">Jeste li ste sigurni da želite arhivirati %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d razgovor</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 062b77ef..44d34d56 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Biztos, hogy törli az összes üzenetet ebből a beszélgetésből\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d beszélgetést</item>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index fdfdead3..da8bb913 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -54,19 +54,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Apakah Anda yakin ingin menghapus semua pesan dari percakapan ini\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="other">%d percakapan</item>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 406a1971..2db10180 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9c89a653..42da574c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Vuoi davvero eliminare tutti i messaggi di questa conversazione\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversazione</item>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 0f32d53b..701108d5 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -57,19 +57,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">האם אתה בטוח שברצונך למחוק את כל ההודעות של השיחה הזו\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">שיחה %d</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7f9d3ac4..365b47a4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -54,19 +54,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">本当にこの会話のすべてのメッセージを削除しますか？</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="other">%d 件の会話</item>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index b4d368df..f76377a2 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Ar tikrai norite ištrinti visas šio pokalbio žinutes\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d pokalbis</item>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index a95a452e..735e595f 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="zero">%d conversation</item>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 9dffb06f..baae62fa 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index c8511934..fc3b43c3 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">ഈ സംഭാഷണത്തിലെ എല്ലാ സന്ദേശങ്ങളും ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d സംഭാഷണം</item>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index ec28a6ef..68572e90 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Er du sikker på at du vil slette alle meldinger fra denne konversasjonen\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d konversasjon</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4e3a69ec..a1a20ed7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Alle berichten in dit gesprek verwijderen\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d gesprek</item>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 1f0af8dd..ca2a41b3 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">تسیں پکے اے، سارے سنیہے مٹاؤ؟</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a65c022c..e6de244b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -57,19 +57,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Czy usunąć wszystkie wiadomości z tej rozmowy\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d rozmowę</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3fa9961d..2a2fb614 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Tem certeza que quer deletar todas as mensagens dessa conversa\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversa</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1e846f70..46173b8d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Tem a certeza de que pretende apagar todas as mensagens desta conversa\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversa</item>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ed856ea6..73cfad5b 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Sunteți sigur că doriți să ștergeți toate mesajele din această conversație\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversaţie</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8081d70f..b2508f78 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -57,19 +57,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Удалить все сообщения в этой переписке\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d переписку</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 20a7efd5..b7f42d58 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Ste si istý, že chcete odstrániť všetky správy tejto konverzácie\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d konverzáciu</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 209e8dd6..aff3970a 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -57,19 +57,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Ste prepričani, da želite izbrisati vsa sporočila tega pogovora\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d pogovor</item>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 1d57fa12..5895b9cd 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -56,19 +56,14 @@
     <!-- Archive -->
     <string name="unarchive">Врати из архиве</string>
     <string name="empty_archive">Обриши све архивиране конверзације</string>
-    <string name="skip_archive">Прескочи архиву, обриши конверзације директно</string>
     <string name="archived_conversations">Архива</string>
     <string name="show_archived_conversations">Прикажи архивиране конверзације</string>
     <string name="archive">Архивирај</string>
     <string name="no_archived_conversations">Нема архивираних разговора</string>
-    <string name="archive_instead_of_delete">Архивирај конверзације умјесто брисанја</string>
-    <string name="archive_is_empty">Архива је празна</string>
     <string name="archive_emptied_successfully">Архива је успјешно испражнјена</string>
     <string name="empty_archive_confirmation">Да ли сте сигурни да желите да испразните архиву? Све архивиране поруке ће бити избрисане.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Да ли сте сигурни да желите да избришете све поруке ове конверзације\?</string>
-    <string name="archive_whole_conversation_confirmation">Да ли сте сигурни да желите да архивирате ову конверзацију?</string>
-    <string name="archive_confirmation">Да ли сте сигурни да желите да архивирате %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d разговор</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index ba5c5318..2e9ad962 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Är du säker på att du vill ta bort alla meddelanden i konversationen\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d konversation</item>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index d194966d..38b4a596 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">இந்த உரையாடலின் அனைத்து செய்திகளையும் நிச்சயமாக நீக்க விரும்புகிறீர்களா\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d உரையாடல்</item>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index ad705429..a188d02b 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -54,19 +54,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="other">%d conversation</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 89bbebc1..0a556625 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Bu görüşmenin tüm mesajlarını silmek istediğinizden emin misiniz\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d görüşme</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7512e647..e2f567ab 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -57,19 +57,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Справді видалити всі повідомлення у цьому листуванні\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d листування</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index bf4b7f0f..0e2efd6b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -54,19 +54,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">您确定要删除此对话的所有消息吗\?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="other">%d 个对话</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 63e78579..416b2177 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -54,19 +54,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">您確定要刪除此對話中的所有訊息嗎？</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="other">%d conversation</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97f3e3a9..0017f34d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,19 +55,14 @@
     <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Remove all archived conversations</string>
-    <string name="skip_archive">Skip the archive, delete conversations directly</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
     <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
-    <string name="archive_instead_of_delete">Archive conversations instead of deleting</string>
-    <string name="archive_is_empty">The archive is empty</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation?</string>
-    <string name="archive_whole_conversation_confirmation">Are you sure you want to archive this conversation?</string>
-    <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>