diff --git a/briar-android/src/main/res/values-bg/strings.xml b/briar-android/src/main/res/values-bg/strings.xml
index 66945399d..7f7b25e79 100644
--- a/briar-android/src/main/res/values-bg/strings.xml
+++ b/briar-android/src/main/res/values-bg/strings.xml
@@ -578,7 +578,10 @@
   <!--Mailbox-->
   <string name="mailbox_settings_title">Пощенска кутия</string>
   <string name="mailbox_setup_intro">Пощенската кутия ви дава възможност да получавате съобщения от контактите ви докато сте извън мрежа. Кутията ще получава съобщенията и ще ги пази до като дойдете на линия.\n\nИнсталирайте приложението Birar Mailbox на резервно устройство. Включете го в захранване и с достъп до безжична мрежа, така че да е винаги на линия.</string>
+  <string name="mailbox_setup_download_link">Споделяне на препратка за изтегляне</string>
   <string name="mailbox_setup_connecting">Свързване…</string>
+  <string name="mailbox_setup_qr_code_wrong_title">Грешен код на QR</string>
+  <string name="mailbox_setup_io_error_title">Грешка при свързване</string>
   <string name="mailbox_setup_paired_title">Свързан</string>
   <string name="tor_offline_title">Извън линия</string>
   <!--Example for string substitution: Last connection: 3min ago-->
diff --git a/briar-android/src/main/res/values-de/strings.xml b/briar-android/src/main/res/values-de/strings.xml
index 4bec31a83..5d08ec58b 100644
--- a/briar-android/src/main/res/values-de/strings.xml
+++ b/briar-android/src/main/res/values-de/strings.xml
@@ -25,6 +25,7 @@
   <string name="setup_huawei_app_launch_text">Bitte tippe auf die Schaltfläche unten, öffne den Bereich \"App-Start\" und stelle sicher, dass Briar auf \"Manuell verwalten\" eingestellt ist.</string>
   <string name="setup_huawei_app_launch_button">Akkueinstellungen öffnen</string>
   <string name="setup_huawei_app_launch_help">Wenn Briar im Bereich \"App-Start\" nicht auf \"Manuell verwalten\" eingestellt ist, kann es nicht im Hintergrund ausgeführt werden.</string>
+  <string name="setup_huawei_app_launch_error_toast">Akkueinstellungen konnten nicht geöffnet werden</string>
   <string name="setup_xiaomi_text">Um im Hintergrund zu laufen, muss Briar in der Liste der zuletzt verwendeten Apps gesperrt werden.</string>
   <string name="setup_xiaomi_button">Briar schützen</string>
   <string name="setup_xiaomi_help">Wenn Briar nicht in der Liste der zuletzt verwendeten Apps gesperrt ist, kann es nicht im Hintergrund ausgeführt werden.</string>
diff --git a/briar-android/src/main/res/values-fr/strings.xml b/briar-android/src/main/res/values-fr/strings.xml
index 494cbe80e..de9e62a78 100644
--- a/briar-android/src/main/res/values-fr/strings.xml
+++ b/briar-android/src/main/res/values-fr/strings.xml
@@ -8,7 +8,7 @@
   <string name="setup_password_explanation">Votre compte Briar est enregistré chiffré sur votre appareil et non dans le nuage. Si vous oubliez votre mot de passe ou désinstallez Briar, votre compte ne peut pas être récupéré.\n\nChoisissez un mot de passe long qui sera difficile à deviner, par exemple quatre mots au hasard ou dix lettres, chiffres et symboles au hasard.</string>
   <string name="setup_doze_title">Connexions d’arrière-plan</string>
   <string name="setup_doze_intro">Pour recevoir des messages, Briar a besoin de rester connectée en arrière-plan.</string>
-  <string name="setup_doze_explanation">Pour recevoir des messages, Briar a besoin de rester connectée en arrière-plan. Veuillez désactiver les optimisations de la batterie afin que Briar puisse rester connectée.</string>
+  <string name="setup_doze_explanation">Pour recevoir des messages, Briar a besoin de rester connectée en arrière-plan. Veuillez désactiver les optimisations de la pile afin que Briar puisse rester connectée.</string>
   <string name="setup_doze_button">Autoriser les connexions</string>
   <string name="choose_nickname">Choisissez votre pseudonyme</string>
   <string name="choose_password">Choisissez votre mot de passe</string>
@@ -25,6 +25,7 @@
   <string name="setup_huawei_app_launch_text">Veuillez toucher le bouton ci-dessous, ouvrir l’écran « Lancement des applis » et vous assurer que « Gérer manuellement » est défini pour Briar.</string>
   <string name="setup_huawei_app_launch_button">Ouvrez les paramètres de la pile</string>
   <string name="setup_huawei_app_launch_help">Si « Gérer manuellement » n’est pas défini pour Briar dans l’écran « Lancement des applis », l’appli ne pourra pas fonctionner en arrière-plan.</string>
+  <string name="setup_huawei_app_launch_error_toast">Impossible d’ouvrir les paramètres de la pile</string>
   <string name="setup_xiaomi_text">Pour fonctionner en arrière-plan, Briar doit être verrouillée à la liste des applis récentes.</string>
   <string name="setup_xiaomi_button">Protéger Briar</string>
   <string name="setup_xiaomi_help">Si Briar n’est pas verrouillée à la liste des applis récentes, elle ne pourra pas fonctionner en arrière-plan.</string>
@@ -50,10 +51,16 @@
     <item quantity="one">Ceci est une version d’essai de Briar. Votre compte arrivera à expiration dans %d jour et ne peut pas être renouvelé.</item>
     <item quantity="other">Ceci est une version d’essai de Briar. Votre compte arrivera à expiration dans %d jours et ne pourra pas être renouvelé.</item>
   </plurals>
+  <plurals name="old_android_expiry_warning">
+    <item quantity="one">Android 4 n’est plus pris en charge. Briar cessera de fonctionner le %s (dans %d jour). Veuillez installer Briar sur un appareil plus récent et créer un nouveau compte.</item>
+    <item quantity="other">Android 4 n’est plus pris en charge. Briar cessera de fonctionner le %s (dans %d jours). Veuillez installer Briar sur un appareil plus récent et créer un nouveau compte.</item>
+  </plurals>
   <string name="expiry_date_reached">Ce logiciel est arrivé à expiration.\nMerci de l’avoir testé !</string>
   <string name="download_briar">Pour continuer à utiliser Briar, veuillez télécharger la dernière version.</string>
   <string name="create_new_account">Vous devrez créer un nouveau compte, mais vous pouvez utiliser le même pseudonyme.</string>
   <string name="download_briar_button">Télécharger la dernière version</string>
+  <string name="old_android_expiry_date_reached">Briar ne fonctionne plus sur Android 4. Veuillez installer Briar sur un appareil plus récent.</string>
+  <string name="old_android_delete_account">Vous pouvez toucher le bouton ci-dessous pour supprimer votre compte de cet appareil.</string>
   <string name="delete_account_button">Supprimer le compte</string>
   <string name="startup_open_database">Déchiffrement de la base de données…</string>
   <string name="startup_migrate_database">Mise à niveau de la base de données…</string>
@@ -281,6 +288,7 @@
   <string name="duplicate_link_dialog_text_1">Vous avez déjà un contact en attente avec ce lien : %s</string>
   <string name="duplicate_link_dialog_text_1_contact">Vous avez déjà un contact avec ce lien : %s</string>
   <!--This is a question asking whether two nicknames refer to the same person-->
+  <string name="duplicate_link_dialog_text_2">%1$s et %2$s sont-elles la même personne ?</string>
   <!--This is a button for answering that two nicknames do indeed refer to the same person. This
 	string will be used in a dialog button, so if the translation of this string is longer than 20
 	characters, please use "Yes" instead, and use "No" for the "Different Person" button-->
@@ -289,6 +297,7 @@
 	will be used in a dialog button, so if the translation of this string longer than 20 characters,
 	please use "No" instead, and use "Yes" for the "Same Person" button-->
   <string name="different_person_button">Une personne différente</string>
+  <string name="duplicate_link_dialog_text_3">%1$s et %2$s vous ont envoyé le même lien.\n\nL\'une de ces personnes pourrait tenter de découvrir qui sont vos contacts.\n\nNe lui dites pas que vous avez reçu le même lien de quelqu’un d’autre.</string>
   <string name="pending_contact_updated_toast">Le contact en attente a été mis à jour</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Présenter vos contacts</string>
@@ -568,8 +577,31 @@
   <string name="choose_ringtone_title">Choisir une sonnerie</string>
   <string name="cannot_load_ringtone">Impossible de charger la sonnerie</string>
   <!--Mailbox-->
+  <string name="mailbox_settings_title">Boîte de courriel</string>
+  <string name="mailbox_setup_title">Paramètres de la boîte de courriel</string>
+  <string name="mailbox_setup_intro">Une Boîte de courriel permet à vos contacts de vous envoyer des messages alors que vous êtes hors ligne. La Boîte de courriel recevra vos messages et les enregistrera jusqu’à votre prochaine connexion. Vous pouvez installer l’appli Boîte de courriel de Briar sur un autre appareil. Gardez-le connecté à l’alimentation et au Wi-Fi afin qu’il soit toujours en ligne.</string>
+  <string name="mailbox_setup_download">Installez d’abord l’appli Boîte de courriel sur un autre appareil en cherchant « Briar Mailbox » dans Google Play ou à l’endroit où vous avez téléchargé Briar.\n
+		\nConnectez ensuite votre Boîte de courriel en balayant le code QR affiché sur l’appli Boîte de courriel.</string>
+  <string name="mailbox_setup_download_link">Partager le lien de téléchargement</string>
+  <string name="mailbox_setup_button_scan">Balayer le code QR de Boîte de courriel</string>
+  <string name="permission_camera_qr_denied_body">Vous avez refusé l’accès à l’appareil photo, mais le balayage d’un code QR de contacts exige de l’utiliser.\n\nVeuillez envisager d’y accorder l’accès.</string>
   <string name="mailbox_setup_connecting">Connexion…</string>
+  <string name="mailbox_setup_qr_code_wrong_title">Le code QR est erroné</string>
+  <string name="mailbox_setup_qr_code_wrong_description">Le code balayé est invalide. Veuillez ouvrir l’appli Boîte de courriel de Briar sur votre appareil Boîte de courriel et balayer le code qu’elle présente.</string>
+  <string name="mailbox_setup_already_paired_title">La Boîte de courriel est déjà reliée</string>
+  <string name="mailbox_setup_already_paired_description">Annuler le lien avec la Boîte de courriel sur l’autre appareil et réessayer.</string>
+  <string name="mailbox_setup_io_error_title">Connexion impossible</string>
+  <string name="mailbox_setup_io_error_description">Assurez-vous que les deux appareils sont connectés à Internet et réessayez.</string>
+  <string name="mailbox_setup_assertion_error_title">Erreur de la Boîte de courriel</string>
+  <string name="mailbox_setup_paired_title">Connecté</string>
+  <string name="mailbox_setup_paired_description">Votre Boîte de courriel a été reliée avec succès à Briar.\n
+		\nGarder votre boîte de courriel connectée à l’alimentation et au Wi-Fi afin qu’elle soit toujours en ligne.</string>
   <string name="tor_offline_title">Hors ligne</string>
+  <string name="mailbox_status_title">État de la Boîte de courriel</string>
+  <string name="mailbox_status_connected_title">La Boîte de courriel est en cours d’exécution</string>
+  <!--Example for string substitution: Last connection: 3min ago-->
+  <!--Indicates that there never was a connection to the mailbox. Last connection: Never-->
+  <string name="mailbox_status_connected_never">Jamais</string>
   <!--Conversation Settings-->
   <string name="disappearing_messages_title">Messages éphémères</string>
   <string name="disappearing_messages_explanation_long">L’activation de ce paramètre fera disparaître
@@ -637,7 +669,7 @@ copies des messages que vous envoyez.
   <string name="permission_location_request_body">Afin de découvrir des périphériques Bluetooth, Briar doit accéder à votre position.\n\nBriar n’enregistre pas votre position et ne la partage avec personne.</string>
   <string name="permission_camera_location_title">Appareil photo et position</string>
   <string name="permission_camera_location_request_body">Afin de balayer le code QR, Briar doit accéder à l’appareil photo.\n\nAfin de découvrir des périphériques Bluetooth, Briar doit accéder à votre position.\n\nBriar n’enregistre pas votre position et ne la partage avec personne.</string>
-  <string name="permission_camera_denied_body">Vous avez refusé l’accès à la caméra, mais l’ajout de contacts exige l’utilisation de celle-ci.\n\nVeuillez envisager d’y accorder l’accès.</string>
+  <string name="permission_camera_denied_body">Vous avez refusé l’accès à l’appareil photo, mais l’ajout de contacts exige de l’utiliser.\n\nVeuillez envisager d’y accorder l’accès.</string>
   <string name="permission_location_denied_body">Vous avez refusé l’accès à votre position géographique, mais Briar en a besoin pour découvrir les appareils Bluetooth.\n\nVeuillez envisager d’y accorder l’accès.</string>
   <string name="permission_location_setting_title">Paramètre de localisation</string>
   <string name="permission_location_setting_body">Afin de trouver d’autres appareils par Bluetooth, le paramètre Position de votre appareil doit être activé. Veuillez l’activer afin de poursuivre. Vous pourrez le désactiver ultérieurement.</string>
diff --git a/briar-android/src/main/res/values-is/strings.xml b/briar-android/src/main/res/values-is/strings.xml
index 1c9925249..f749c765e 100644
--- a/briar-android/src/main/res/values-is/strings.xml
+++ b/briar-android/src/main/res/values-is/strings.xml
@@ -576,8 +576,38 @@
   <string name="choose_ringtone_title">Veldu hringitón</string>
   <string name="cannot_load_ringtone">Get ekki hlaðið inn hringitóni</string>
   <!--Mailbox-->
+  <string name="mailbox_settings_title">Pósthólf</string>
+  <string name="mailbox_setup_title">Uppsetning pósthólfs</string>
+  <string name="mailbox_setup_intro">Pósthólf gerir tengiliðunum þínum kleift að senda þér skilaboð á meðan þú ert ekki á netinu. Pósthólfið tekur við skilaboðum og geymir þau þar til þú kemst í samband.\n
+		\nÞú getur sett upp Briar Mailbox pósthólfsforritið á aukatæki. Haltu því tengdu við rafmagn og Wi-Fi þannig að það verði alltaf til taks á netinu.</string>
+  <string name="mailbox_setup_download">Fyrst skaltu setja upp pósthólfsforritið á öðru tæki með því að leita að \"Briar Mailbox\" á Google Play eða hvar sem það var sem þú náðir í Briar.\n
+		\nTengdu síðan pósthólfið við Briar með því að skanna QR-kóðann sem birtist í pósthólfsforritinu.</string>
+  <string name="mailbox_setup_download_link">Deila niðurhalstengli</string>
+  <string name="mailbox_setup_button_scan">Skanna QR-kóða pósthólfs</string>
+  <string name="permission_camera_qr_denied_body">Þú hefur hafnað aðgangi að myndavélinni, en það að skanna QR-kóða krefst notkun hennar.\n\nÍhugaðu að veita þennan aðgang.</string>
   <string name="mailbox_setup_connecting">Tengist…</string>
+  <string name="mailbox_setup_qr_code_wrong_title">Rangur QR-kóði</string>
+  <string name="mailbox_setup_qr_code_wrong_description">Skannaði kóðinn er ógildur. Opnaðu Briar Mailbox forritið á pósthólfstækinu þínu og skannaðu QR-kóðann sem það birtir.</string>
+  <string name="mailbox_setup_already_paired_title">Pósthólf er þegar tengt</string>
+  <string name="mailbox_setup_already_paired_description">Aftengdu pósthólfið á hinu tækinu þínu og prófaðu aftur.</string>
+  <string name="mailbox_setup_io_error_title">Mistókst að tengjast</string>
+  <string name="mailbox_setup_io_error_description">Gakktu úr skugga um að bæði tækin séu tengd við internetið og prófaðu svo aftur.</string>
+  <string name="mailbox_setup_assertion_error_title">Villa í pósthólfi</string>
+  <string name="mailbox_setup_assertion_error_description">Sendu umsögn (með naflausum gögnum) í gegnum Briar forritið ef vandamálið er viðvarandi.</string>
+  <string name="mailbox_setup_camera_error_description">Náði ekki sambandi við myndavél. Prófaðu aftur, kannski eftir að hafa endurræst tækið.</string>
+  <string name="mailbox_setup_paired_title">Tengt</string>
+  <string name="mailbox_setup_paired_description">Tekist hefur að tengja pósthólfið þitt við Briar.\n
+		\nHaltu pósthólfinu þínu tengdu við rafmagn og Wi-Fi þannig að það sé alltaf á netinu.</string>
   <string name="tor_offline_title">Ónettengt</string>
+  <string name="tor_offline_description">Gakktu úr skugga um að þetta tæki sé tengt við netið og að tengingar við internetið séu leyfðar.\n
+		\nSíðan skaltu bíða eftir að hnatttáknið á tengistillingaskjánum verði grænt.</string>
+  <string name="tor_offline_button_check">Athugaðu tengistillingarnar</string>
+  <string name="mailbox_status_title">Staða pósthólfs</string>
+  <string name="mailbox_status_connected_title">Pósthólf er í gangi</string>
+  <!--Example for string substitution: Last connection: 3min ago-->
+  <string name="mailbox_status_connected_info">Síðasta tenging: %s</string>
+  <!--Indicates that there never was a connection to the mailbox. Last connection: Never-->
+  <string name="mailbox_status_connected_never">Aldrei</string>
   <!--Conversation Settings-->
   <string name="disappearing_messages_title">Sjálfeyðandi skilaboð</string>
   <string name="disappearing_messages_explanation_long">Ef kveikt er á þessari stillingu munu ný
diff --git a/briar-android/src/main/res/values-ru/strings.xml b/briar-android/src/main/res/values-ru/strings.xml
index b4227268e..210ceea67 100644
--- a/briar-android/src/main/res/values-ru/strings.xml
+++ b/briar-android/src/main/res/values-ru/strings.xml
@@ -25,6 +25,7 @@
   <string name="setup_huawei_app_launch_text">Пожалуйста, нажмите кнопку ниже, откройте экран \"Запуск приложения\" и убедитесь, что для Briar установлено значение \"Управлять вручную\".</string>
   <string name="setup_huawei_app_launch_button">Открыть настройки батареи</string>
   <string name="setup_huawei_app_launch_help">Если для Briar не установлено значение \"Управлять вручную\" на экране \"Запуск приложения\", он не сможет работать в фоновом режиме.</string>
+  <string name="setup_huawei_app_launch_error_toast">Не удалось открыть настройки батареи</string>
   <string name="setup_xiaomi_text">Для работы в фоновом режиме Briar должен быть закреплен в списке недавних приложений.</string>
   <string name="setup_xiaomi_button">Защитить Briar</string>
   <string name="setup_xiaomi_help">Если Briar не закреплен в списке последних приложений, он не сможет работать в фоновом режиме.</string>
@@ -90,7 +91,7 @@
   <string name="tor_plugin_status_inactive">Briar не может подключиться к интернету.</string>
   <string name="tor_plugin_status_disabled">Briar настроен не использовать интернет</string>
   <string name="tor_plugin_status_disabled_mobile_data">Briar настроен не использовать мобильную сеть</string>
-  <string name="tor_plugin_status_disabled_battery">Briar настроен не использовать интернет при работе от батареи</string>
+  <string name="tor_plugin_status_disabled_battery">Briar настроен так, чтобы не использовать интернет при работе от батареи</string>
   <string name="tor_plugin_status_disabled_country_blocked">Briar настроен не использовать интернет в этой стране</string>
   <!--Transports: Wi-Fi-->
   <string name="transport_lan">Wi-Fi</string>
@@ -616,9 +617,26 @@
   <string name="mailbox_setup_connecting">Соединение...</string>
   <string name="mailbox_setup_qr_code_wrong_title">Неправильный QR-код</string>
   <string name="mailbox_setup_qr_code_wrong_description">Отсканированный код недействителен. Пожалуйста, откройте приложение Briar Mailbox на вашем устройстве и просканируйте представленный QR-код.</string>
+  <string name="mailbox_setup_already_paired_title">Maibox уже связан</string>
+  <string name="mailbox_setup_already_paired_description">Отвяжите Mailbox на другом устройстве и повторите попытку.</string>
+  <string name="mailbox_setup_io_error_title">Не удалось подключиться</string>
+  <string name="mailbox_setup_io_error_description">Убедитесь, что оба устройства подключены к интернету, и повторите попытку.</string>
+  <string name="mailbox_setup_assertion_error_title">Ошибка Mailbox</string>
+  <string name="mailbox_setup_assertion_error_description">Пожалуйста, отправьте отзыв (с анонимными данными) через приложение Briar, если проблема сохраняется.</string>
+  <string name="mailbox_setup_camera_error_description">Не удалось получить доступ к камере. Попробуйте еще раз. Возможно поможет перезагрузка устройства.</string>
+  <string name="mailbox_setup_paired_title">Подключено</string>
+  <string name="mailbox_setup_paired_description">Ваш Mailbox был успешно связан с Briar.\n
+		\nДержите Mailbox подключенным к электропитанию и Wi-Fi, чтобы он всегда был доступен.</string>
   <string name="tor_offline_title">Отключен</string>
-  <string name="tor_offline_description">Убедитесь, что устройство находится в сети и подключение к интернету разрешено.\n\nПосле этого дождитесь, пока значок глобуса в настройках подключения станет зеленым.</string>
+  <string name="tor_offline_description">Убедитесь, что данное устройство находится в сети и подключение к интернету разрешено.\n
+		\nПосле этого дождитесь, пока значок глобуса на экране настроек подключения станет зеленым.</string>
   <string name="tor_offline_button_check">Проверьте настройки подключения</string>
+  <string name="mailbox_status_title">Статус Mailbox</string>
+  <string name="mailbox_status_connected_title">Mailbox запущен</string>
+  <!--Example for string substitution: Last connection: 3min ago-->
+  <string name="mailbox_status_connected_info">Последнее подключение: %s</string>
+  <!--Indicates that there never was a connection to the mailbox. Last connection: Never-->
+  <string name="mailbox_status_connected_never">Никогда</string>
   <!--Conversation Settings-->
   <string name="disappearing_messages_title">Исчезающие сообщения</string>
   <string name="disappearing_messages_explanation_long">Включение этого параметра приведет к созданию нового
@@ -709,7 +727,7 @@
   <string name="hotspot_button_stop_sharing">Остановить точку доступа</string>
   <string name="hotspot_progress_text_start">Настройка точки доступа...</string>
   <string name="hotspot_notification_channel_title">Точка доступа Wi-Fi</string>
-  <string name="hotspot_notification_title">Поделиться Briar оффлайн</string>
+  <string name="hotspot_notification_title">Поделиться Briar офлайн</string>
   <string name="hotspot_button_connected">Далее</string>
   <string name="permission_hotspot_location_request_body">Для создания точки доступа Wi-Fi Briar необходимо разрешение на доступ к вашему местоположению.\n\nBriar не хранит ваше местоположение и не передает его кому-либо.</string>
   <string name="permission_hotspot_location_denied_body">Доступ к местоположению запрещен, но Briar необходимо это разрешение для создания точки доступа Wi-Fi.\n\nРассмотрите возможность предоставления доступа.</string>
diff --git a/briar-android/src/main/res/values-sq/strings.xml b/briar-android/src/main/res/values-sq/strings.xml
index 1eb825d84..42745728e 100644
--- a/briar-android/src/main/res/values-sq/strings.xml
+++ b/briar-android/src/main/res/values-sq/strings.xml
@@ -25,6 +25,7 @@
   <string name="setup_huawei_app_launch_text">Ju lutemi, prekni butonin më poshtë, hapni skenën “Nisje aplikacioni” dhe sigurohuni se për Briar-in është zgjedhur “Administrojeni dorazi”.</string>
   <string name="setup_huawei_app_launch_button">Hapni Rregullime Baterie</string>
   <string name="setup_huawei_app_launch_help">Nëse për Briar-in s’është zgjedhur “Administroje Dorazi” te skena “Nisje Aplikacioni”, s’do të jetë në gjendje të xhirojë në prapaskenë.</string>
+  <string name="setup_huawei_app_launch_error_toast">S’u hapën dot rregullimet e baterisë</string>
   <string name="setup_xiaomi_text">Për të xhiruar në prapaskenë, Briar-i lyp të jetë i kyçur te lista e aplikacioneve të përdorur së fundi.</string>
   <string name="setup_xiaomi_button">Mbroje Briar-in</string>
   <string name="setup_xiaomi_help">Nëse Briar-i s’është i kyçur te lista e aplikacioneve të përdorur së fundi, s’do të jetë në gjendje të xhirojë në prapaskenë.</string>
@@ -589,10 +590,27 @@ dhe s’mund të hapet me këtë version.\n\nJu lutemi, përmirësojeni me versi
   <string name="permission_camera_qr_denied_body">Keni mohuar hyrjen te kamera, por skanimi i një kodi QR lyp përdorimin e kamerës.\n\nJu lutemi, shihni mundësinë e dhënies së hyrjes.</string>
   <string name="mailbox_setup_connecting">Po lidhjet…</string>
   <string name="mailbox_setup_qr_code_wrong_title">Kod QR i gabuar</string>
-  <string name="mailbox_setup_qr_code_wrong_description">Kodi i skanuar është i pavlefshëm. Ju lutemi, hapeni aplikacionin Kuti postare Briar te pajisja juaj për kuti postare dhe skanoni kodin QR që shfaq.</string>
+  <string name="mailbox_setup_qr_code_wrong_description">Kodi i skanuar është i pavlefshëm. Ju lutemi, hapni aplikacionin Kuti Postare Briar në pajisjen tuaj me Kutinë Postare dhe skanoni kodin QR që paraqitet.</string>
+  <string name="mailbox_setup_already_paired_title">Kuti postare tashmë e lidhur</string>
+  <string name="mailbox_setup_already_paired_description">Shkëputeni Kutinë postare në pajisjen tuaj tjetër dhe riprovoni.</string>
+  <string name="mailbox_setup_io_error_title">S’u bë dot lidhje</string>
+  <string name="mailbox_setup_io_error_description">Siguroni që të dyja pajisjet të jenë të lidhura në Internet dhe riprovoni.</string>
+  <string name="mailbox_setup_assertion_error_title">Gabim kutie postare</string>
+  <string name="mailbox_setup_assertion_error_description">Nëse problemi vazhdon, ju lutemi, dërgoni përshtypjet (me të dhëna anonime) përmes aplikacionit Briar.</string>
+  <string name="mailbox_setup_camera_error_description">S’u përdor dot kamera. Riprovoni, ndoshta pas rinisjes së pajisjes.</string>
+  <string name="mailbox_setup_paired_title">I lidhur</string>
+  <string name="mailbox_setup_paired_description">Kutia juaj postare është lidhur me sukses me Briar-in.\n
+		\nMbajeni Kutinë tuaj postare të lidhur në rrjet energjie dhe me Wi-Fi, që të jetë përherë në linjë.</string>
   <string name="tor_offline_title">Jo në linjë</string>
-  <string name="tor_offline_description">Garantoni që kjo pajisje të jetë në lidhje dhe me lidhje në internet të lejuara.\n\nMë pas, prisni që ikona glob, te rregullimet e lidhjes, të bëhet e gjelbër.</string>
+  <string name="tor_offline_description">Siguroni që kjo pajisje të jetë në linjë dhe lidhjet me Internetin të jenë të lejuara.\n
+		\nMë pas, pritni që ikona glob te rregullimet e lidhjes të shndërrohet e gjelbër.</string>
   <string name="tor_offline_button_check">Kontrolloni rregullime lidhjeje</string>
+  <string name="mailbox_status_title">Gjendje kutie postare</string>
+  <string name="mailbox_status_connected_title">Kutia postare po punon</string>
+  <!--Example for string substitution: Last connection: 3min ago-->
+  <string name="mailbox_status_connected_info">Lidhja e fundit: %s</string>
+  <!--Indicates that there never was a connection to the mailbox. Last connection: Never-->
+  <string name="mailbox_status_connected_never">Kurrë</string>
   <!--Conversation Settings-->
   <string name="disappearing_messages_title">Mesazhe që treten</string>
   <string name="disappearing_messages_explanation_long">Aktivizimi i këtij rregullimi do të bëjë që
diff --git a/briar-android/src/main/res/values-zh-rCN/strings.xml b/briar-android/src/main/res/values-zh-rCN/strings.xml
index f3b530dd6..294b360ee 100644
--- a/briar-android/src/main/res/values-zh-rCN/strings.xml
+++ b/briar-android/src/main/res/values-zh-rCN/strings.xml
@@ -25,6 +25,7 @@
   <string name="setup_huawei_app_launch_text">轻按下方按钮，打开“App launch”界面，确保 Briar 被设置为“手动管理”。</string>
   <string name="setup_huawei_app_launch_button">打开电池设置</string>
   <string name="setup_huawei_app_launch_help">如果“App 启动”界面中 Briar 没有被设置为“手动管理”，则其将无法在后台运行。</string>
+  <string name="setup_huawei_app_launch_error_toast">无法打开电池设置</string>
   <string name="setup_xiaomi_text">要在后台运行，需将 Briar 锁定在最近的应用列表中。</string>
   <string name="setup_xiaomi_button">保护 Briar</string>
   <string name="setup_xiaomi_help">如果未将 Briar 锁定到最近的应用列表，它将无法在后台运行。</string>
@@ -562,9 +563,9 @@
   <string name="choose_ringtone_title">选择铃声</string>
   <string name="cannot_load_ringtone">无法加载铃声</string>
   <!--Mailbox-->
-  <string name="mailbox_settings_title">邮箱</string>
-  <string name="mailbox_setup_title">邮箱设置</string>
-  <string name="mailbox_setup_intro">邮箱使你的联系人能够在你离线时向你发送消息。邮箱将接收你的邮件，并将其存储到你上线为止。\n
+  <string name="mailbox_settings_title">Mailbox</string>
+  <string name="mailbox_setup_title">Mailbox 设置</string>
+  <string name="mailbox_setup_intro">Mailbox 使你的联系人能够在你离线时向你发送消息。它将接收你的邮件，并将其存储到你上线为止。\n
 		\n 你可以在备用设备上安装 Briar Mailbox 应用，并确保此设备始终有电且和Wi-Fi连接，这样它就永远在线了。</string>
   <string name="mailbox_setup_download">首先，通过 Google Play 或任何你下载了 Briar 的地方搜索“Briar Mailbox”，在另一台设备上安装 Mailbox 应用。\n
 		\n然后通过扫描邮箱应用显示的二维码将你的 Mailbox 与Briar 链接起来。</string>
@@ -573,10 +574,27 @@
   <string name="permission_camera_qr_denied_body">你拒绝了使用相机，但扫描二维码需要使用相机。\n\n请考虑授予访问权限。</string>
   <string name="mailbox_setup_connecting">连接中……</string>
   <string name="mailbox_setup_qr_code_wrong_title">错误的二维码</string>
-  <string name="mailbox_setup_qr_code_wrong_description">扫描的代码无效。请在安装有 Mailbox 应用的设备上打开 Briar 邮箱应用，并扫描它显示的二维码。</string>
+  <string name="mailbox_setup_qr_code_wrong_description">扫描的代码无效。请在安装有 Mailbox 应用的设备上打开 Briar Mailbox 应用，并扫描它显示的二维码。</string>
+  <string name="mailbox_setup_already_paired_title">Mailbox 已链接</string>
+  <string name="mailbox_setup_already_paired_description">取消链接你其他设备上的 Mailbox 并重试。</string>
+  <string name="mailbox_setup_io_error_title">无法连接</string>
+  <string name="mailbox_setup_io_error_description">请确保两台设备都已连接到互联网，然后重试。</string>
+  <string name="mailbox_setup_assertion_error_title">Mailbox 错误</string>
+  <string name="mailbox_setup_assertion_error_description">如这个问题持续，请通过 Briar 应用发送反馈（附匿名数据）。</string>
+  <string name="mailbox_setup_camera_error_description">无法访问摄像头。再试一次，可能在重启设备之后。</string>
+  <string name="mailbox_setup_paired_title">已连接</string>
+  <string name="mailbox_setup_paired_description">你的 Mailbox 已成功和 Briar 链接。\n
+		\n保持你的 Mailbox 连接到电源和 Wi-Fi，这样它就能始终处于在线状态。</string>
   <string name="tor_offline_title">离线</string>
-  <string name="tor_offline_description">请确保设备处于在线状态，且允许连接到互联网。\n\n然后，等待连接设置中的全局图标变为绿色。</string>
+  <string name="tor_offline_description">请确保设备处于在线状态，且允许连接到互联网。\n
+		\n 然后，等待连接设置中的全局图标变为绿色。</string>
   <string name="tor_offline_button_check">检查连接设置</string>
+  <string name="mailbox_status_title">Mailbox 状态</string>
+  <string name="mailbox_status_connected_title">Mailbox 运行中</string>
+  <!--Example for string substitution: Last connection: 3min ago-->
+  <string name="mailbox_status_connected_info">上次连接：%s</string>
+  <!--Indicates that there never was a connection to the mailbox. Last connection: Never-->
+  <string name="mailbox_status_connected_never">永不</string>
   <!--Conversation Settings-->
   <string name="disappearing_messages_title">让消息自动消失</string>
   <string name="disappearing_messages_explanation_long">打开此设置将使