diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 12ec44e148..9cfbbccae7 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -228,6 +228,7 @@
     <string name="title_advanced_flags_background">Mostrar fondo coloreado en lugar de estrellas de color</string>
     <string name="title_advanced_preview">Mostrar vista previa de mensajes</string>
     <string name="title_advanced_preview_italic">Mostrar vista previa de mensaje en cursiva</string>
+    <string name="title_advanced_preview_lines">Número de líneas de vista previa</string>
     <string name="title_advanced_addresses">Mostrar detalles de dirección por defecto</string>
     <string name="title_advanced_attachments_alt">Mostrar adjuntos después del texto del mensaje</string>
     <string name="title_advanced_contrast">Utilizar contraste alto para el texto del mensaje</string>
@@ -315,6 +316,7 @@
     <string name="title_advanced_autoclose_hint">Cerrar automáticamente hilos de conversación cuando todos los mensajes son archivados, enviados o eliminados</string>
     <string name="title_advanced_sender_hint">La mayoría de los proveedores no permiten direcciones de remitente modificadas</string>
     <string name="title_advanced_display_hidden_hint">Esto puede resultar en textos dobles o de apariencia extraña</string>
+    <string name="title_advanced_display_pin_hint">Un PIN tiene prioridad sobre la autenticación biométrica</string>
     <string name="title_advanced_subscribed_only_hint">Activar esto eliminará todas las carpetas locales sin suscripción</string>
     <string name="title_advanced_english_hint">Esto reiniciará la app</string>
     <string name="title_advanced_experiments_hint">Lista de características experimentales actuales</string>
@@ -438,6 +440,7 @@
     <string name="title_folder_sent">Enviados</string>
     <string name="title_folder_system">Sistema</string>
     <string name="title_folder_user">Usuario</string>
+    <string name="title_folder_user_only">Sólo carpetas de usuario</string>
     <string name="title_folder_primary">Cuenta primaria de carpetas</string>
     <string name="title_folders_unified">Carpetas de bandeja de entrada unificada</string>
     <string name="title_no_folders">No hay carpetas</string>
@@ -891,4 +894,10 @@
         <item>Normal</item>
         <item>Alta</item>
     </string-array>
+    <string-array name="linesNames">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 129a9c0ee6..69031272ee 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -316,7 +316,7 @@
     <string name="title_advanced_autoclose_hint">Fermer automatiquement les conversations quand tous les messages sont archivés, envoyés ou mis à la corbeille</string>
     <string name="title_advanced_sender_hint">La plupart des fournisseurs n\'autorisent pas les adresses d\'expéditeur modifiées</string>
     <string name="title_advanced_display_hidden_hint">Ceci peut entraîner un affichage étrange et des textes en double</string>
-    <string name="title_advanced_display_pin_hint">Un code PIN a priorité sur l\'authentification biométrique</string>
+    <string name="title_advanced_display_pin_hint">Le code PIN a priorité sur l\'authentification biométrique</string>
     <string name="title_advanced_subscribed_only_hint">Activer ceci supprimera tous les dossiers locaux sans abonnement</string>
     <string name="title_advanced_english_hint">Ceci va redémarrer l’application</string>
     <string name="title_advanced_experiments_hint">Liste des fonctionnalités expérimentales actuelles</string>
@@ -412,7 +412,7 @@
     <string name="title_folder_name">Nom du dossier</string>
     <string name="title_display_name">Nom</string>
     <string name="title_show_folders">Afficher les dossiers cachés</string>
-    <string name="title_apply_to_all">Appliquer à tous les &#8230;</string>
+    <string name="title_apply_to_all">Appliquer à tous les&#8230;</string>
     <string name="title_hide_folder">Masquer le dossier</string>
     <string name="title_unified_folder">Afficher dans la boîte de réception unifiée</string>
     <string name="title_navigation_folder">Afficher dans le menu de navigation</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index dc34bce829..381f989044 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -3,8 +3,8 @@
 <resources>
     <string name="app_search">FairEmail 搜索</string>
     <string name="app_changelog">更新日志</string>
-    <string name="app_welcome">FairEmail是一个专注于隐私与安全的开源电子邮件app。正因如此某些功能的工作方式可能与您习惯的不同。</string>
-    <string name="app_limitations">例如，为了去除不安全元素并提高阅读性，邮件将总被重建格式；出于安全考虑，打开邮件内链接需经用户确认</string>
+    <string name="app_welcome">FairEmail是一个专注于隐私与安全的开源电子邮件app, 正因如此某些功能的工作方式可能与您习惯的不同。</string>
+    <string name="app_limitations">例如，为了去除不安全元素并提高阅读性，邮件将总被重建格式；出于安全考虑，打开邮件内链接时需经用户确认</string>
     <string name="app_crash">FairEmail不支持该设备，因为 android 中的bug会导致崩溃</string>
     <string name="app_exit">再按一次返回键退出</string>
     <string name="channel_service">服务</string>
@@ -76,7 +76,7 @@
     <string name="menu_other">其他应用</string>
     <string name="title_welcome">欢迎</string>
     <string name="title_eula">最终用户许可协议</string>
-    <string name="title_agree">我同意</string>
+    <string name="title_agree">同意</string>
     <string name="title_disagree">拒绝</string>
     <string name="title_version">版本 %1$s</string>
     <string name="title_list_accounts">账户</string>
@@ -106,7 +106,7 @@
     <string name="title_setup_quick_success">已成功添加了一个账户和身份</string>
     <string name="title_setup_quick_failed">您也可以尝试在下方配置一个账户和身份</string>
     <string name="title_setup_manage">管理</string>
-    <string name="title_setup_grant">授予</string>
+    <string name="title_setup_grant">授权</string>
     <string name="title_setup_account">设置账户</string>
     <string name="title_setup_account_remark">用于接收电子邮件</string>
     <string name="title_setup_account_hint">左/右滑动目标文件夹来更改颜色</string>
@@ -186,7 +186,7 @@
     <string name="title_advanced_autoresize">自动调整附加和嵌入图片的大小</string>
     <string name="title_advanced_resize_pixels">&lt; %1$d像素</string>
     <string name="title_advanced_lookup_mx">发送前检查收件人电子邮件地址</string>
-    <string name="title_advanced_send_delayed">推迟发送消息</string>
+    <string name="title_advanced_send_delayed">延迟发送消息</string>
     <string name="title_advanced_metered">使用按流量计费的连接</string>
     <string name="title_advanced_download">在计量的连接下自动下载邮件和附件, 最高可达</string>
     <string name="title_advanced_roaming">漫游时下载邮件和附件</string>
@@ -216,6 +216,7 @@
     <string name="title_advanced_flags_background">显示有色背景而非有色星标</string>
     <string name="title_advanced_preview">显示邮件预览</string>
     <string name="title_advanced_preview_italic">斜体字显示邮件预览</string>
+    <string name="title_advanced_preview_lines">预览行数</string>
     <string name="title_advanced_addresses">默认显示地址详情</string>
     <string name="title_advanced_attachments_alt">在消息文本后显示附件</string>
     <string name="title_advanced_contrast">对消息文本使用高对比度颜色</string>
@@ -303,6 +304,7 @@
     <string name="title_advanced_autoclose_hint">在所有邮件存档、发送或丢弃时自动关闭对话线程</string>
     <string name="title_advanced_sender_hint">大多数提供商不允许修改发件人地址</string>
     <string name="title_advanced_display_hidden_hint">这可能导致古怪的外观和双重文本</string>
+    <string name="title_advanced_display_pin_hint">PIN码优先于生物验证</string>
     <string name="title_advanced_subscribed_only_hint">启用此功能将删除所有未订阅的本地文件夹</string>
     <string name="title_advanced_english_hint">这将重新启动应用程序</string>
     <string name="title_advanced_experiments_hint">当前实验性功能列表</string>
@@ -426,6 +428,7 @@
     <string name="title_folder_sent">已发送邮件</string>
     <string name="title_folder_system">系统</string>
     <string name="title_folder_user">用户</string>
+    <string name="title_folder_user_only">仅用户文件夹</string>
     <string name="title_folder_primary">文件夹主账户</string>
     <string name="title_folders_unified">聚合收件箱文件夹</string>
     <string name="title_no_folders">无文件夹</string>
@@ -878,4 +881,10 @@ FairEmail会显示一条消息来提醒您这一点，这条消息在您购买
         <item>正常</item>
         <item>高</item>
     </string-array>
+    <string-array name="linesNames">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
 </resources>