diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43a22ffb0e..fa4c96a8eb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -174,7 +174,7 @@
     </activity-alias>
 
     <activity android:name=".ConversationListArchiveActivity"
-              android:label="@string/AndroidManifeset_conversations_archive"
+              android:label="@string/AndroidManifest_conversations_archive"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:parentActivityName=".ConversationListActivity">
diff --git a/res/menu/conversation_list_batch_archive.xml b/res/menu/conversation_list_batch_archive.xml
index 1c91c1b358..3ed58c44eb 100644
--- a/res/menu/conversation_list_batch_archive.xml
+++ b/res/menu/conversation_list_batch_archive.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/conversation_list_batch__archive_selected"
+    <item android:title="@string/conversation_list_batch_archive__menu_archive_selected"
           android:id="@+id/menu_archive_selected"
           android:icon="@drawable/ic_archive_white_24dp"
           app:showAsAction="always"/>
diff --git a/res/menu/conversation_list_batch_unarchive.xml b/res/menu/conversation_list_batch_unarchive.xml
index ecb7bb310b..3d42468333 100644
--- a/res/menu/conversation_list_batch_unarchive.xml
+++ b/res/menu/conversation_list_batch_unarchive.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/conversation_list_batch__archive_selected"
+    <item android:title="@string/conversation_list_batch_unarchive__menu_unarchive_selected"
           android:id="@+id/menu_archive_selected"
           android:icon="@drawable/ic_unarchive_white_24dp"
           app:showAsAction="always"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e1d3c989e..ba8f647845 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -873,7 +873,7 @@
     <string name="AndroidManifest__message_details">Message details</string>
     <string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
     <string name="AndroidManifest__invite_friends">Invite friends</string>
-    <string name="AndroidManifeset_conversations_archive">Conversations archive</string>
+    <string name="AndroidManifest_conversations_archive">Conversations archive</string>
 
     <!-- arrays.xml -->
     <string name="arrays__import_export">Import / export</string>
@@ -1055,7 +1055,8 @@
     <!-- conversation_list_batch -->
     <string name="conversation_list_batch__menu_delete_selected">Delete selected</string>
     <string name="conversation_list_batch__menu_select_all">Select all</string>
-    <string name="conversation_list_batch__archive_selected">Archive selected</string>
+    <string name="conversation_list_batch_archive__menu_archive_selected">Archive selected</string>
+    <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Unarchive selected</string>
 
     <!-- conversation_list -->
     <string name="conversation_list__menu_search">Search</string>