diff --git a/README.md b/README.md
index 11f898d13..be8bc444b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# ProtonMail for Android
+# Proton Mail for Android
 
-Copyright (c) 2020 Proton Technologies AG
+Copyright (c) 2020 Proton AG
 
 ## License
 
diff --git a/app/src/alpha/res/values/strings.xml b/app/src/alpha/res/values/strings.xml
index 5a2709992..b17dc2d7a 100644
--- a/app/src/alpha/res/values/strings.xml
+++ b/app/src/alpha/res/values/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <!-- endregion -->
 
     <string name="app_version_code" translatable="false">%1$s (%2$d)</string>
diff --git a/app/src/main/res/layout/drawer_footer.xml b/app/src/main/res/layout/drawer_footer.xml
index e1c0e13cd..4995f20d9 100644
--- a/app/src/main/res/layout/drawer_footer.xml
+++ b/app/src/main/res/layout/drawer_footer.xml
@@ -24,4 +24,4 @@
     android:textAppearance="@style/Proton.Text.Caption"
     android:textColor="?attr/proton_sidebar_text_weak"
     android:gravity="center"
-    tools:text="ProtonMail 1.2.3 (123)" />
+    tools:text="Proton Mail 1.2.3 (123)" />
diff --git a/app/src/main/res/layout/layout_recipient_dropdown_item.xml b/app/src/main/res/layout/layout_recipient_dropdown_item.xml
index 612e305cb..bacd445bd 100644
--- a/app/src/main/res/layout/layout_recipient_dropdown_item.xml
+++ b/app/src/main/res/layout/layout_recipient_dropdown_item.xml
@@ -72,7 +72,7 @@
         android:textAppearance="@style/Proton.Text.Default"
         android:maxLines="1"
         android:ellipsize="end"
-        tools:text="ProtonMail user"/>
+        tools:text="Proton Mail user" />
 
     <!-- email -->
     <TextView
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index b87234a93..8f32edfa2 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Afegir carpeta</string>
     <string name="x_add_label">Afegir etiqueta</string>
     <string name="x_days">Dies</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 872201f90..f2138691a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Přidat složku</string>
     <string name="x_add_label">Přidat štítek</string>
     <string name="x_days">Dny</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b02b72076..d8e45b71d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Tilføj mappe</string>
     <string name="x_add_label">Tilføj etiket</string>
     <string name="x_days">Dage</string>
@@ -155,7 +155,7 @@
     <string name="snackbar_action_discard">Kassér</string>
     <!-- endregion -->
     <!-- region Old / V3 / pre-conventions -->
-    <string name="protonmail">ProtonMail</string>
+    <string name="protonmail">Proton Mail</string>
     <string name="sign_out">Log ud</string>
     <string name="sign_out_question">Er du sikker på, at du vil logge ud?</string>
     <string name="processing_request">Din anmodning behandles</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c9e888236..20bd279d4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Ordner hinzufügen</string>
     <string name="x_add_label">Kategorie hinzufügen</string>
     <string name="x_days">Tage</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4cb7e3751..d94d28d89 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Προσθήκη φακέλου</string>
     <string name="x_add_label">Προσθήκη ετικέτας</string>
     <string name="x_days">Ημέρες</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 265899d35..e4927811c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Añadir carpeta</string>
     <string name="x_add_label">Añadir etiqueta</string>
     <string name="x_days">Días</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2d4b7057e..f492f93c9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Ajouter un dossier</string>
     <string name="x_add_label">Ajouter un label</string>
     <string name="x_days">Jours</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index e92bcfb7e..133c1e97e 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Új mappa</string>
     <string name="x_add_label">Új címke</string>
     <string name="x_days">Nap</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 8d2ee29e6..8e9d58656 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Tambah folder</string>
     <string name="x_add_label">Tambah label</string>
     <string name="x_days">Hari</string>
diff --git a/app/src/main/res/values-is-rIS/strings.xml b/app/src/main/res/values-is-rIS/strings.xml
index 60af752c5..d03a605a1 100644
--- a/app/src/main/res/values-is-rIS/strings.xml
+++ b/app/src/main/res/values-is-rIS/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Bæta við möppu</string>
     <string name="x_add_label">Bæta við merkingu</string>
     <string name="x_days">Dagar</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e0d33fc0e..f14a61674 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Aggiungi cartella</string>
     <string name="x_add_label">Aggiungi etichetta</string>
     <string name="x_days">Giorni</string>
@@ -155,7 +155,7 @@
     <string name="snackbar_action_discard">Scarta</string>
     <!-- endregion -->
     <!-- region Old / V3 / pre-conventions -->
-    <string name="protonmail">ProtonMail</string>
+    <string name="protonmail">Proton Mail</string>
     <string name="sign_out">Esci</string>
     <string name="sign_out_question">È sicuro di voler uscire?</string>
     <string name="processing_request">La tua richiesta è in elaborazione</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9d3e8c725..ab71ecb8b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">フォルダーを追加</string>
     <string name="x_add_label">ラベルを追加</string>
     <string name="x_days">日</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 91f565958..cebcf0fc3 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Rnu akaram</string>
     <string name="x_add_label">Rnu tabzimt</string>
     <string name="x_days">Ussan</string>
@@ -155,7 +155,7 @@
     <string name="snackbar_action_discard">Discard</string>
     <!-- endregion -->
     <!-- region Old / V3 / pre-conventions -->
-    <string name="protonmail">ProtonMail</string>
+    <string name="protonmail">Proton Mail</string>
     <string name="sign_out">Ffeɣ</string>
     <string name="sign_out_question">Tebɣiḍ ad teffɣeḍ?</string>
     <string name="processing_request">Your request is being processed</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 79f64f7ea..3b2859df0 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Map toevoegen</string>
     <string name="x_add_label">Label toevoegen</string>
     <string name="x_days">Dagen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d2dc42cff..0cc3e9ed2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Dodaj folder</string>
     <string name="x_add_label">Dodaj etykietę</string>
     <string name="x_days">dni</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index dc421c3d5..136082072 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Adicionar pasta</string>
     <string name="x_add_label">Adicionar marcador</string>
     <string name="x_days">Dias</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f65ce56a1..4eebad497 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Adicionar pasta</string>
     <string name="x_add_label">Adicionar etiqueta</string>
     <string name="x_days">Dias</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f858cdeee..7da96c2c6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Добавить папку</string>
     <string name="x_add_label">Добавить ярлык</string>
     <string name="x_days">Дней</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f17334e3c..fc67d7bde 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Lägg till mapp</string>
     <string name="x_add_label">Lägg till etikett</string>
     <string name="x_days">Dagar</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ff081f4cd..dd1c48334 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Klasör ekle</string>
     <string name="x_add_label">Etiket ekle</string>
     <string name="x_days">Gün</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 538993e35..a0b9d56bd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Додати теку</string>
     <string name="x_add_label">Додати мітку</string>
     <string name="x_days">Днів</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 26e682599..1ee73a838 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">添加文件夹</string>
     <string name="x_add_label">添加标签</string>
     <string name="x_days">天</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2bae5c6dd..9ac2eb527 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,7 +19,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">新增資料夾</string>
     <string name="x_add_label">新增標籤</string>
     <string name="x_days">天</string>
diff --git a/app/src/main/res/values/cnfg.xml b/app/src/main/res/values/cnfg.xml
index b0383121c..3fe7cf1b7 100644
--- a/app/src/main/res/values/cnfg.xml
+++ b/app/src/main/res/values/cnfg.xml
@@ -18,7 +18,7 @@
   ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 <resources>
-    <string name="app_name" translatable="false">ProtonMail</string>
+    <string name="app_name" translatable="false">Proton Mail</string>
     <string name="repeating_snooze_default_start_time">22:00</string>
     <string name="repeating_snooze_default_end_time">08:00</string>
     <integer name="repeating_snooze_start_hour">22</integer>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f2da7cff7..ae2c7bfb1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <!-- region All -->
-    <string name="x_app_version_name_code">ProtonMail %s (%d)</string>
+    <string name="x_app_version_name_code">Proton Mail %s (%d)</string>
     <string name="x_add_folder">Add folder</string>
     <string name="x_add_label">Add label</string>
     <string name="x_days">Days</string>
@@ -85,7 +85,7 @@
     <string name="composer_quote_sender_header">On %s, %s &lt; %s&gt; wrote:</string>
 
     <string name="set_msg_password_title">Set password</string>
-    <string name="set_msg_password_info">Set a password to encrypt this message for non-ProtonMail users. <a href="https://protonmail.com/support/knowledge-base/encrypt-for-outside-users/">Learn more</a></string>
+    <string name="set_msg_password_info">Set a password to encrypt this message for non-Proton Mail users. <a href="https://protonmail.com/support/knowledge-base/encrypt-for-outside-users/">Learn more</a></string>
     <string name="set_msg_password_info_icon_description">Info</string>
     <string name="set_msg_password_msg_password_title">Message password</string>
     <string name="set_msg_password_msg_password_hint">4 to 21 characters long</string>
@@ -174,7 +174,7 @@
     <!-- endregion -->
 
     <!-- region Old / V3 / pre-conventions -->
-    <string name="protonmail">ProtonMail</string>
+    <string name="protonmail">Proton Mail</string>
     <string name="sign_out">Sign Out</string>
     <string name="sign_out_question">Are you sure you want to sign out?</string>
     <string name="processing_request">Your request is being processed</string>
@@ -187,9 +187,9 @@
     <string name="no_more_messages">No more messages</string>
     <string name="no_network_queued">No network, message queued</string>
     <string name="update_app_title">Update required</string>
-    <string name="update_app">Your ProtonMail app cannot be used until it is updated</string>
+    <string name="update_app">Your Proton Mail app cannot be used until it is updated</string>
     <string name="you_are_offline">You are offline</string>
-    <string name="api_offline">ProtonMail is currently offline, check https://protonstatus.com or our twitter for the current status: https://twitter.com/protonmail</string>
+    <string name="api_offline">Proton Mail is currently offline, check https://protonstatus.com or our twitter for the current status: https://twitter.com/protonmail</string>
     <string name="contact_saved">Contact saved</string>
     <string name="contact_saved_offline">Contact saved, will be synced when connection is available</string>
     <string name="contact_exist">Contact email already exists</string>
@@ -217,7 +217,7 @@
     <string name="all_mail">All Mail</string>
     <string name="contacts">Contacts</string>
     <string name="search_contacts">Search contacts</string>
-    <string name="fetching_contacts">Fetching ProtonMail contacts...</string>
+    <string name="fetching_contacts">Fetching Proton Mail contacts...</string>
     <string name="fetching_contacts_success">Contacts refreshed successfully</string>
     <string name="fetching_contacts_failure">Unable to refresh contacts</string>
     <string name="no_search_results">No search results</string>
@@ -296,7 +296,7 @@
     <string name="invalid_email_address">The address \'%s\' is invalid</string>
     <string name="invalid_email_address_removed">The address \'%s\' is invalid and was removed</string>
     <string name="no_recipients_specified">Please add at least one recipient</string>
-    <string name="no_password_specified">Expiration times can only be set on fully encrypted messages. Please set a password for your non-ProtonMail recipients.</string>
+    <string name="no_password_specified">Expiration times can only be set on fully encrypted messages. Please set a password for your non-Proton Mail recipients.</string>
     <string name="attachment_limit">Attachments are limited to %1$s. Total attached would be %2$s.</string>
     <string name="sending_message">Sending message...</string>
     <string name="sending_message_offline">Offline, queued for sending later...</string>
@@ -311,7 +311,7 @@
     <string name="cancel">Cancel</string>
     <string name="close">Close</string>
     <string name="eo_password_title">Set Password</string>
-    <string name="eo_password_subtitle">Set a password to encrypt this message for non-ProtonMail users</string>
+    <string name="eo_password_subtitle">Set a password to encrypt this message for non-Proton Mail users</string>
     <string name="eo_password_more_info">Get more information</string>
 
     <string name="no_attachments">0 Attachments</string>
@@ -432,7 +432,7 @@
     <string name="contact_details">Contact Details</string>
     <string name="email_type_home">Home</string>
     <string name="type_title">Choose Type</string>
-    <string name="sync_local_contacts">Upload to ProtonMail</string>
+    <string name="sync_local_contacts">Upload to Proton Mail</string>
     <string name="please_select_only_phone_contacts">Please select only Local Phone Contacts</string>
 
     <string name="contact_vcard_hint_email">Enter Email</string>
@@ -522,7 +522,7 @@
     <string name="saving">Saving...</string>
 
     <string name="update_folder">Update Folder</string>
-    <string name="spam_score_100">This email seems to be from a ProtonMail address but came from outside our system and failed our authentication requirements. It may be spoofed or improperly forwarded!</string>
+    <string name="spam_score_100">This email seems to be from a Proton Mail address but came from outside our system and failed our authentication requirements. It may be spoofed or improperly forwarded!</string>
     <string name="spam_score_101">This email has failed its domain\'s authentication requirements. It may be spoofed or improperly forwarded!</string>
     <string name="spam_score_102">This message may be a phishing attempt. Please check the sender and contents to make sure they are legitimate. <a href="https://protonmail.com/blog/prevent-phishing-attacks/">LEARN MORE</a></string>
 
@@ -552,10 +552,10 @@
     <string name="email_empty">Email address is missing</string>
     <string name="encrypted_contact_details">Encrypted Contact Details</string>
     <string name="convert_question">Upload local contacts</string>
-    <string name="convert_question_subtitle">This will upload the local contacts on your device to your ProtonMail contacts directory. You will then be able to access these contacts on your other devices through ProtonMail.</string>
+    <string name="convert_question_subtitle">This will upload the local contacts on your device to your Proton Mail contacts directory. You will then be able to access these contacts on your other devices through Proton Mail.</string>
     <string name="refresh_contacts">Refresh</string>
     <string name="invalid_email_some_contacts">Email address is not valid for some of your contacts</string>
-    <string name="protonmail_contacts">ProtonMail Contacts</string>
+    <string name="protonmail_contacts">Proton Mail Contacts</string>
     <string name="device_contacts">Device Contacts</string>
 
     <string name="print_date_template">Date: %s</string>
@@ -569,7 +569,7 @@
 
     <string name="attachment_storage_value_current">Currently selected: %dMB</string>
     <string name="attachment_storage_value_current_unlimited">Currently selected: Unlimited</string>
-    <string name="attachment_offline_max_storage">Sets the maximum amount of storage space ProtonMail can use on your mobile device.</string>
+    <string name="attachment_offline_max_storage">Sets the maximum amount of storage space Proton Mail can use on your mobile device.</string>
     <string name="load_embedded_images_failed_no_network">Embedded images loading failed. Please check your network connection.</string>
     <string name="load_embedded_images_failed">Embedded images loading failed.</string>
     <string name="unlimited">Unlimited</string>
@@ -585,7 +585,7 @@
     <!-- Sender locks -->
     <string name="sender_lock_zero_access">Stored with zero access encryption</string> <!-- External message that was encrypted by the BE -->
     <string name="sender_lock_sent_end_to_end">Sent by you with end-to-end encryption</string> <!-- External message that was encrypted by the BE -->
-    <string name="sender_lock_sent_autoresponder">Sent by ProtonMail with zero access encryption</string>
+    <string name="sender_lock_sent_autoresponder">Sent by Proton Mail with zero access encryption</string>
     <string name="sender_lock_verification_failed">Sender verification failed</string>
     <string name="sender_lock_pgp_encrypted">PGP-encrypted message</string>
     <string name="sender_lock_pgp_encrypted_verified">PGP-encrypted message from verified address</string>
@@ -700,7 +700,7 @@
         access to storage.</string>
     <string name="need_contacts_permissions_text">In order to import contacts you need to allow access to contacts.</string>
     <string name="push_notifications_alert_title">Push notifications alert</string>
-    <string name="push_notifications_alert_subtitle">Push notifications for ProtonMail do not work without updated Google Play services.</string>
+    <string name="push_notifications_alert_subtitle">Push notifications for Proton Mail do not work without updated Google Play services.</string>
     <string name="app_locked">App locked</string>
     <string name="use_pin_instead">Use PIN instead</string>
 
@@ -741,7 +741,7 @@
     <string name="signature">Signature</string>
     <string name="mobile_footer">Mobile footer</string>
     <string name="edit_mobile_footer">Enable mobile footer</string>
-    <string name="default_mobile_footer">Sent from ProtonMail mobile</string>
+    <string name="default_mobile_footer">Sent from Proton Mail mobile</string>
     <string name="mobile_footer_is_premium">Changing the Mobile Footer is allowed to Paid users only</string>
     <string name="mobile_footer_info">This footer is added after your signature</string>