Added option to mark messages read on move

app/src/main/java/eu/faircode/email/FragmentOptions.java

@@ -73,7 +73,8 @@ public class FragmentOptions extends FragmentEx implements SharedPreferences.OnS
 
     private SwitchCompat swSwipe;
     private SwitchCompat swActionbar;
-    private SwitchCompat swAutoclose;
+    private SwitchCompat swAutoClose;
+    private SwitchCompat swAutoRead;
     private SwitchCompat swCollapse;
     private SwitchCompat swAutoMove;
     private SwitchCompat swConfirm;
@@ -112,7 +113,8 @@ public class FragmentOptions extends FragmentEx implements SharedPreferences.OnS
 
         swSwipe = view.findViewById(R.id.swSwipe);
         swActionbar = view.findViewById(R.id.swActionbar);
-        swAutoclose = view.findViewById(R.id.swAutoclose);
+        swAutoClose = view.findViewById(R.id.swAutoClose);
+        swAutoRead = view.findViewById(R.id.swAutoRead);
         swCollapse = view.findViewById(R.id.swCollapse);
         swAutoMove = view.findViewById(R.id.swAutoMove);
         swConfirm = view.findViewById(R.id.swConfirm);
@@ -299,14 +301,22 @@ public class FragmentOptions extends FragmentEx implements SharedPreferences.OnS
             }
         });
 
-        swAutoclose.setChecked(prefs.getBoolean("autoclose", true));
-        swAutoclose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swAutoClose.setChecked(prefs.getBoolean("autoclose", true));
+        swAutoClose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("autoclose", checked).apply();
             }
         });
 
+        swAutoRead.setChecked(prefs.getBoolean("autoread", false));
+        swAutoRead.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("autoread", checked).apply();
+            }
+        });
+
         swCollapse.setChecked(prefs.getBoolean("collapse", false));
         swCollapse.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -355,18 +355,14 @@ public class ServiceSynchronize extends LifecycleService {
                                         EntityFolder archive = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE);
                                         if (archive == null)
                                             archive = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
-                                        if (archive != null) {
-                                            EntityOperation.queue(db, message, EntityOperation.SEEN, true);
+                                        if (archive != null)
                                             EntityOperation.queue(db, message, EntityOperation.MOVE, archive.id);
-                                        }
                                         break;
 
                                     case "trash":
                                         EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
-                                        if (trash != null) {
-                                            EntityOperation.queue(db, message, EntityOperation.SEEN, true);
+                                        if (trash != null)
                                             EntityOperation.queue(db, message, EntityOperation.MOVE, trash.id);
-                                        }
                                         break;
 
                                     case "ignore":
@@ -1654,6 +1650,10 @@ public class ServiceSynchronize extends LifecycleService {
         if (imessage == null)
             throw new MessageRemovedException();
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (prefs.getBoolean("autoread", false) && !imessage.isSet(Flags.Flag.SEEN))
+            imessage.setFlag(Flags.Flag.SEEN, true);
+
         if (istore.hasCapability("MOVE")) {
             Folder itarget = istore.getFolder(target.name);
             ifolder.moveMessages(new Message[]{imessage}, itarget);
@@ -1950,6 +1950,7 @@ public class ServiceSynchronize extends LifecycleService {
                     }
                 }
 
+                // https://tools.ietf.org/html/rfc3501#section-5.1
                 if ("INBOX".equals(fullName.toUpperCase()))
                     type = EntityFolder.INBOX;
 

app/src/main/res/layout/fragment_options.xml

@@ -335,7 +335,7 @@
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swAutoclose"
+            android:id="@+id/swAutoClose"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
@@ -357,7 +357,19 @@
             android:textStyle="italic"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swAutoclose" />
+            app:layout_constraintTop_toBottomOf="@id/swAutoClose" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swAutoRead"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="12dp"
+            android:text="@string/title_advanced_autoread"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAutocloseHint"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swCollapse"
@@ -368,7 +380,7 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_collapse"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAutocloseHint"
+            app:layout_constraintTop_toBottomOf="@id/swAutoRead"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat

app/src/main/res/values-az-rAZ/strings.xml

@@ -91,6 +91,8 @@
     <string name="title_advanced_section_misc">Qarışıq</string>
     <string name="title_advanced_enabled">Eyniləşdirmə</string>
     <string name="title_advanced_metered">Ölçülmüş bağlantıları istifadə et</string>
+    <string name="title_advanced_download">Mesajları və qoşmaları ölçülmüş bağlantıda avtomatik endir</string>
+    <string name="title_advanced_browse">Serverdəki mesajlara nəzər yetir</string>
     <string name="title_advanced_unified">Birləşmiş gələn qutusu</string>
     <string name="title_advanced_threading">Danışıq sırası</string>
     <string name="title_advanced_compact">Yığcam mesaj görünüşü</string>
@@ -99,13 +101,11 @@
     <string name="title_advanced_preview">Mesaj ilkin baxışını göstər</string>
     <string name="title_advanced_light">Bildiriş işığından istifadə et</string>
     <string name="title_advanced_sound">Bildiriş səsi seç</string>
-    <string name="title_advanced_browse">Serverdəki mesajlara nəzər yetir</string>
     <string name="title_advanced_swipe">Sürüşdürmə hərəkətləri</string>
     <string name="title_advanced_actionbar">Söhbət hərəkət sətri</string>
     <string name="title_advanced_autoclose">Söhbətləri avtomatik bağla</string>
     <string name="title_advanced_confirm">Gizlilik həssaslı məlumatların sızmasına səbəb ola biləcək hərəkətləri təsdiqlə</string>
     <string name="title_advanced_sender">Göndərənin ünvanına düzəlişə icazə ver</string>
-    <string name="title_advanced_download">Mesajları və qoşmaları ölçülmüş bağlantıda avtomatik endir</string>
     <string name="title_advanced_updates">Yeniləmələri yoxla</string>
     <string name="title_advanced_debug">Sazlama rejimi</string>
     <string name="title_advanced_enabled_hint">Qlobal olaraq mesajların göndərilməsi və alınmasını fəallaşdır və ya ləğv et</string>

app/src/main/res/values-ca-rES/strings.xml

@@ -60,9 +60,9 @@
     <string name="title_setup_light_theme">Tema clar</string>
     <string name="title_setup_dark_theme">Tema fosc</string>
     <string name="title_advanced">Opcions avançades</string>
+    <string name="title_advanced_browse">Busca missatges en el servidor remot</string>
     <string name="title_advanced_avatars">Mostra les fotos dels contactes</string>
     <string name="title_advanced_light">Utilitza el led de notificacions</string>
-    <string name="title_advanced_browse">Busca missatges en el servidor remot</string>
     <string name="title_advanced_swipe">Accions per lliscar</string>
     <string name="title_advanced_debug">Mode de depuració</string>
     <string name="title_select">Selecciona &#8230;</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -91,6 +91,8 @@
     <string name="title_advanced_section_misc">Verschiedenes</string>
     <string name="title_advanced_enabled">Synchronisieren</string>
     <string name="title_advanced_metered">Getaktete Verbindungen verwenden</string>
+    <string name="title_advanced_download">Automatisches Herunterladen von E-Mails und Anhängen auf getakteten Verbindungen bis zu einer Größe von</string>
+    <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
     <string name="title_advanced_unified">Sammeleingang</string>
     <string name="title_advanced_threading">Konversationsansicht</string>
     <string name="title_advanced_compact">Kompakte Nachrichtenansicht</string>
@@ -99,13 +101,11 @@
     <string name="title_advanced_preview">Nachrichtenvorschau anzeigen</string>
     <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
     <string name="title_advanced_sound">Benachrichtigungston auswählen</string>
-    <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
     <string name="title_advanced_swipe">Wischgesten</string>
     <string name="title_advanced_actionbar">Navigationsleiste in Konversationen</string>
     <string name="title_advanced_autoclose">Konversationen automatisch schließen</string>
     <string name="title_advanced_confirm">Aktionen bestätigen, die datenschutzrelevante Information preisgeben können</string>
     <string name="title_advanced_sender">Bearbeitung der Absenderadresse erlauben</string>
-    <string name="title_advanced_download">Automatisches Herunterladen von E-Mails und Anhängen auf getakteten Verbindungen bis zu einer Größe von</string>
     <string name="title_advanced_updates">Nach Aktualisierungen suchen</string>
     <string name="title_advanced_debug">Debugmodus</string>
     <string name="title_advanced_enabled_hint">Vollständiges de-/aktivieren der Empfangs- und Versandfunktion von E-Mails</string>

app/src/main/res/values-es-rES/strings.xml

@@ -91,6 +91,8 @@
     <string name="title_advanced_section_misc">Misceláneas</string>
     <string name="title_advanced_enabled">Sincronizar</string>
     <string name="title_advanced_metered">Usar conexión de datos</string>
+    <string name="title_advanced_download">Descargar automáticamente mensajes y adjuntos usando conexión de datos hasta</string>
+    <string name="title_advanced_browse">Explorar mensajes en el servidor</string>
     <string name="title_advanced_unified">Bandeja de Entrada Unificada</string>
     <string name="title_advanced_threading">Hilos de conversación</string>
     <string name="title_advanced_compact">Vista de mensajes compacta</string>
@@ -99,14 +101,12 @@
     <string name="title_advanced_preview">Mostrar vista previa de mensajes</string>
     <string name="title_advanced_light">Usar luz de notificación</string>
     <string name="title_advanced_sound">Seleccionar sonido de notificación</string>
-    <string name="title_advanced_browse">Explorar mensajes en el servidor</string>
     <string name="title_advanced_swipe">Acciones al deslizar</string>
     <string name="title_advanced_actionbar">Barra de acciones de conversación</string>
     <string name="title_advanced_autoclose">Cerrar conversaciones automáticamente</string>
     <string name="title_advanced_collapse">Colapsar mensajes en conversaciones al ir \'atrás\'</string>
     <string name="title_advanced_confirm">Confirmar acciones que podrían filtrar información privada sensible</string>
     <string name="title_advanced_sender">Permitir editar dirección del remitente</string>
-    <string name="title_advanced_download">Descargar automáticamente mensajes y adjuntos usando conexión de datos hasta</string>
     <string name="title_advanced_updates">Buscar actualizaciones</string>
     <string name="title_advanced_debug">Modo de depuración</string>
     <string name="title_advanced_enabled_hint">Desactivar o activar globalmente la recepción y envío de mensajes</string>

app/src/main/res/values-fr-rFR/strings.xml

@@ -91,6 +91,8 @@
     <string name="title_advanced_section_misc">Divers</string>
     <string name="title_advanced_enabled">Synchroniser</string>
     <string name="title_advanced_metered">Utiliser des connexions limitées</string>
+    <string name="title_advanced_download">Télécharger automatiquement les messages et les pièces jointes avec une connexion limitée jusqu\'à</string>
+    <string name="title_advanced_browse">Lire directement les messages sur le serveur</string>
     <string name="title_advanced_unified">Boite de réception unifiée</string>
     <string name="title_advanced_threading">Fil de conversation</string>
     <string name="title_advanced_compact">Affichage compact des messages</string>
@@ -99,7 +101,6 @@
     <string name="title_advanced_preview">Afficher l\'aperçu du message</string>
     <string name="title_advanced_light">Utiliser le voyant de notification</string>
     <string name="title_advanced_sound">Sélectionner le son pour les notifications</string>
-    <string name="title_advanced_browse">Lire directement les messages sur le serveur</string>
     <string name="title_advanced_swipe">Gestes de balayage</string>
     <string name="title_advanced_actionbar">Barre d\'action de conversation</string>
     <string name="title_advanced_autoclose">Fermer automatiquement les conversations</string>
@@ -107,7 +108,6 @@
     <string name="title_advanced_automove">Confirmer le déplacement des messages</string>
     <string name="title_advanced_confirm">Confirmer les actions qui peuvent entraîner une fuite d\'informations sensibles privées</string>
     <string name="title_advanced_sender">Autoriser la modification de l\'adresse de l\'expéditeur</string>
-    <string name="title_advanced_download">Télécharger automatiquement les messages et les pièces jointes avec une connexion limitée jusqu\'à</string>
     <string name="title_advanced_updates">Vérifier les mises à jour</string>
     <string name="title_advanced_debug">Débogage</string>
     <string name="title_advanced_enabled_hint">Désactiver ou activer globalement la réception et l\'envoi de messages</string>
@@ -343,6 +343,7 @@
     <string name="title_no">Non</string>
     <string name="title_undo">Annuler</string>
     <string name="title_add">Ajouter</string>
+    <string name="title_browse">Parcourir</string>
     <string name="title_report">Rapport</string>
     <string name="title_try">Essayez FairEmail, une application de messagerie pour Android, open source, respectant la vie privée</string>
     <string name="title_pro_feature">Il s\'agit d\'une fonctionnalité Pro</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -91,6 +91,8 @@
     <string name="title_advanced_section_misc">Altro</string>
     <string name="title_advanced_enabled">Sincronizza</string>
     <string name="title_advanced_metered">Usa connessioni a consumo</string>
+    <string name="title_advanced_download">Scarica automaticamente i messaggi e gli allegati con una connessione a consumo fino a</string>
+    <string name="title_advanced_browse">Sfoglia i messaggi sul server</string>
     <string name="title_advanced_unified">Posta in arrivo unificata</string>
     <string name="title_advanced_threading">Thread di conversazione</string>
     <string name="title_advanced_compact">Visualizzazione messaggio compatto</string>
@@ -99,14 +101,12 @@
     <string name="title_advanced_preview">Mostra l\'anteprima del messaggio</string>
     <string name="title_advanced_light">Usa il led di notifica</string>
     <string name="title_advanced_sound">Seleziona il suono di notifica</string>
-    <string name="title_advanced_browse">Sfoglia i messaggi sul server</string>
     <string name="title_advanced_swipe">Azioni swipe</string>
     <string name="title_advanced_actionbar">Barra di azione di conversazione</string>
     <string name="title_advanced_autoclose">Chiudi automaticamente le conversazioni</string>
     <string name="title_advanced_collapse">Raggruppa i messaggi in conversazioni premendo \'indietro\'</string>
     <string name="title_advanced_confirm">Conferma le azioni che potrebbero rivelare informazioni personali sensibili</string>
     <string name="title_advanced_sender">Consenti la modifica dell\'indirizzo mittente</string>
-    <string name="title_advanced_download">Scarica automaticamente i messaggi e gli allegati con una connessione a consumo fino a</string>
     <string name="title_advanced_updates">Controlla aggiornamenti</string>
     <string name="title_advanced_debug">Debug</string>
     <string name="title_advanced_enabled_hint">Attiva o disattiva a livello globale la ricezione e l\'invio dei messaggi</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -91,6 +91,8 @@
     <string name="title_advanced_section_misc">Diversen</string>
     <string name="title_advanced_enabled">Synchroniseren</string>
     <string name="title_advanced_metered">Gemeten verbindingen gebruiken</string>
+    <string name="title_advanced_download">Automatisch downloaden van berichten en bijlagen op een gemeten verbinding tot</string>
+    <string name="title_advanced_browse">Blader door berichten op de server</string>
     <string name="title_advanced_unified">Gecombineerd postvak in</string>
     <string name="title_advanced_threading">Gesprekken groeperen</string>
     <string name="title_advanced_compact">Compacte berichtweergave</string>
@@ -99,15 +101,14 @@
     <string name="title_advanced_preview">Bericht voorvertoning</string>
     <string name="title_advanced_light">Gebruik meldingslicht</string>
     <string name="title_advanced_sound">Selecteer meldingsgeluid</string>
-    <string name="title_advanced_browse">Blader door berichten op de server</string>
     <string name="title_advanced_swipe">Veegacties</string>
     <string name="title_advanced_actionbar">Actiebalk gesprek</string>
     <string name="title_advanced_autoclose">Gesprekken automatisch sluiten</string>
+    <string name="title_advanced_autoread">Markeer bericht automatisch als gelezen bij het verplaatsen van een bericht</string>
     <string name="title_advanced_collapse">Berichten in gesprekken samenvouwen bij \'terug\'</string>
     <string name="title_advanced_automove">Bevestig het verplaatsen van berichten</string>
     <string name="title_advanced_confirm">Bevestigen van acties die privacy gevoelige informatie kunnen lekken</string>
     <string name="title_advanced_sender">Bewerken verzendadres toestaan</string>
-    <string name="title_advanced_download">Automatisch downloaden van berichten en bijlagen op een gemeten verbinding tot</string>
     <string name="title_advanced_updates">Controleren op updates</string>
     <string name="title_advanced_debug">Foutopsporing modus</string>
     <string name="title_advanced_enabled_hint">Globaal in- of uitschakelen van het ontvangen en verzenden van berichten</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -90,6 +90,8 @@
     <string name="title_advanced_section_misc">Różne</string>
     <string name="title_advanced_enabled">Synchronizuj</string>
     <string name="title_advanced_metered">Użyj połączeń taryfowych</string>
+    <string name="title_advanced_download">Automatycznie pobieraj wiadomości i załączniki przy połączeniach taryfowych do</string>
+    <string name="title_advanced_browse">Przeglądaj wiadomości na serwerze</string>
     <string name="title_advanced_unified">Wspólna skrzynka odbiorcza</string>
     <string name="title_advanced_threading">Konwersacje w wątkach</string>
     <string name="title_advanced_compact">Widok kompaktowy</string>
@@ -98,12 +100,10 @@
     <string name="title_advanced_preview">Pokaż podgląd wiadomości</string>
     <string name="title_advanced_light">Użyj diody powiadomień</string>
     <string name="title_advanced_sound">Wybierz dźwięk powiadomienia</string>
-    <string name="title_advanced_browse">Przeglądaj wiadomości na serwerze</string>
     <string name="title_advanced_swipe">Gesty przesuwania</string>
     <string name="title_advanced_autoclose">Automatycznie zamykaj konwersacje</string>
     <string name="title_advanced_confirm">Potwierdź działania, które mogą spowodować wyciek wrażliwych informacji</string>
     <string name="title_advanced_sender">Zezwól na edycję adresu nadawcy</string>
-    <string name="title_advanced_download">Automatycznie pobieraj wiadomości i załączniki przy połączeniach taryfowych do</string>
     <string name="title_advanced_updates">Sprawdź aktualizacje</string>
     <string name="title_advanced_debug">Debuguj</string>
     <string name="title_advanced_metered_hint">Połączeniu taryfowe to głównie połączenia komórkowe lub płatne hotspoty Wi-Fi</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -97,6 +97,8 @@
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_enabled">Sincronizare</string>
     <string name="title_advanced_metered">Folosește conexiuni contorizate</string>
+    <string name="title_advanced_download">Descarcă automat mesajele și atașamentele, folosind o conexiune contorizată, până în</string>
+    <string name="title_advanced_browse">Răsfoiește mesajele de pe server</string>
     <string name="title_advanced_unified">Căsuță poștală comună</string>
     <string name="title_advanced_threading">Aranjare mesaje în conversație</string>
     <string name="title_advanced_compact">Afișarea compactă a mesajelor</string>
@@ -105,7 +107,6 @@
     <string name="title_advanced_preview">Arată previzualizare mesaj</string>
     <string name="title_advanced_light">Folosire LED de notificare</string>
     <string name="title_advanced_sound">Selectare sunet de notificare</string>
-    <string name="title_advanced_browse">Răsfoiește mesajele de pe server</string>
     <string name="title_advanced_swipe">Acțiuni glisare</string>
     <string name="title_advanced_actionbar">Bara de acțiuni corversație</string>
     <string name="title_advanced_autoclose">Închide automat conversaţiile</string>
@@ -113,7 +114,6 @@
     <string name="title_advanced_automove">Confirmă mutarea mesajelor</string>
     <string name="title_advanced_confirm">Confirmarea operațiilor care ar putea divulga informații confidențiale</string>
     <string name="title_advanced_sender">Permite editarea adresei expeditorului</string>
-    <string name="title_advanced_download">Descarcă automat mesajele și atașamentele, folosind o conexiune contorizată, până în</string>
     <string name="title_advanced_updates">Verificare actualizări aplicație</string>
     <string name="title_advanced_debug">Depanare</string>
     <string name="title_advanced_enabled_hint">Control global pentru recepția și trimiterea mesajelor</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -65,6 +65,8 @@
     <string name="title_advanced_section_misc">Разное</string>
     <string name="title_advanced_enabled">Cинхронизировать</string>
     <string name="title_advanced_metered">Использовать другие соединения</string>
+    <string name="title_advanced_download">Автоматически загружать сообщения и вложения для лимитного соединения до</string>
+    <string name="title_advanced_browse">Просмотр сообщений на сервере</string>
     <string name="title_advanced_unified">Единый почтовый ящик</string>
     <string name="title_advanced_threading">Связанные диалоги</string>
     <string name="title_advanced_compact">Компактный вид сообщения</string>
@@ -73,13 +75,11 @@
     <string name="title_advanced_preview">Показать предварительный просмотр сообщения</string>
     <string name="title_advanced_light">Использовать индикатор уведомлений</string>
     <string name="title_advanced_sound">Выбрать звук уведомления</string>
-    <string name="title_advanced_browse">Просмотр сообщений на сервере</string>
     <string name="title_advanced_swipe">Жесты</string>
     <string name="title_advanced_actionbar">Панель управления диалогами</string>
     <string name="title_advanced_autoclose">Автоматически закрывать диалоги</string>
     <string name="title_advanced_confirm">Подтвердить действия, которое может привести к утечке конфиденциальной информации</string>
     <string name="title_advanced_sender">Разрешить редактирование адреса отправителя</string>
-    <string name="title_advanced_download">Автоматически загружать сообщения и вложения для лимитного соединения до</string>
     <string name="title_advanced_updates">Проверить наличие обновлений</string>
     <string name="title_advanced_debug">Режим отладки</string>
     <string name="title_advanced_browse_hint">Загрузить больше сообщений при прокрутке вниз</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -79,18 +79,18 @@
     <string name="title_setup_black_background">Svart bakgrund</string>
     <string name="title_advanced">Avancerade inställningar</string>
     <string name="title_advanced_enabled">Synkronisera</string>
+    <string name="title_advanced_download">Hämta automatiskt meddelanden och bilagor på en uppmätt anslutning upp till</string>
+    <string name="title_advanced_browse">Bläddra bland meddelanden på servern</string>
     <string name="title_advanced_compact">Kompakt meddelandevisning</string>
     <string name="title_advanced_avatars">Visa kontaktfoton</string>
     <string name="title_advanced_identicons">Visa identicons</string>
     <string name="title_advanced_preview">Förhandsvisning av meddelande</string>
     <string name="title_advanced_light">Använda aviseringslampan</string>
-    <string name="title_advanced_browse">Bläddra bland meddelanden på servern</string>
     <string name="title_advanced_swipe">Svepfunktioner</string>
     <string name="title_advanced_actionbar">Konversationens åtgärdsfält</string>
     <string name="title_advanced_autoclose">Stäng konversationer automatiskt</string>
     <string name="title_advanced_confirm">Bekräfta åtgärder som kan läcka känslig information</string>
     <string name="title_advanced_sender">Tillåt redigering avsändaradress</string>
-    <string name="title_advanced_download">Hämta automatiskt meddelanden och bilagor på en uppmätt anslutning upp till</string>
     <string name="title_advanced_updates">Sök efter uppdateringar</string>
     <string name="title_advanced_debug">Felsökningsläge</string>
     <string name="title_advanced_sender_hint">De flesta leverantörer tillåter inte ändrade avsändaradresser</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -86,6 +86,7 @@
     <string name="title_advanced_section_misc">Çeşitli</string>
     <string name="title_advanced_enabled">Eşzamanlama</string>
     <string name="title_advanced_metered">Ölçülü bağlantıları kullan</string>
+    <string name="title_advanced_browse">Sunucudaki iletilere göz atın</string>
     <string name="title_advanced_unified">Birleştirilmiş gelen kutusu</string>
     <string name="title_advanced_compact">Kompakt mesaj görünümü</string>
     <string name="title_advanced_avatars">Kişi fotoğraflarını göster</string>
@@ -93,7 +94,6 @@
     <string name="title_advanced_preview">İleti önizlemesini göster</string>
     <string name="title_advanced_light">Bildirim ışığını kullan</string>
     <string name="title_advanced_sound">Bildirim sesini seçin</string>
-    <string name="title_advanced_browse">Sunucudaki iletilere göz atın</string>
     <string name="title_advanced_swipe">Kaydırma eylemleri</string>
     <string name="title_advanced_sender">Gönderici adresini düzenlemeye izin ver</string>
     <string name="title_advanced_updates">Güncellemelere bak</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -85,6 +85,8 @@
     <string name="title_advanced_section_misc">杂项</string>
     <string name="title_advanced_enabled">同步</string>
     <string name="title_advanced_metered">使用按流量计费的连接</string>
+    <string name="title_advanced_download">在计量的连接下自动下载邮件和附件, 最高可达</string>
+    <string name="title_advanced_browse">浏览服务器上的消息</string>
     <string name="title_advanced_unified">聚合收件箱</string>
     <string name="title_advanced_compact">简洁信息视图</string>
     <string name="title_advanced_avatars">显示联系人头像</string>
@@ -92,13 +94,11 @@
     <string name="title_advanced_preview">显示邮件预览</string>
     <string name="title_advanced_light">使用指示灯</string>
     <string name="title_advanced_sound">选择通知提示音</string>
-    <string name="title_advanced_browse">浏览服务器上的消息</string>
     <string name="title_advanced_swipe">滑动操作</string>
     <string name="title_advanced_actionbar">对话操作栏</string>
     <string name="title_advanced_autoclose">自动关闭对话</string>
     <string name="title_advanced_confirm">确认执行可能泄露隐私敏感信息的操作</string>
     <string name="title_advanced_sender">允许编辑发件人地址</string>
-    <string name="title_advanced_download">在计量的连接下自动下载邮件和附件, 最高可达</string>
     <string name="title_advanced_updates">检查更新</string>
     <string name="title_advanced_debug">调试模式</string>
     <string name="title_advanced_enabled_hint">全局禁用或启用邮件的接收和发送</string>

app/src/main/res/values/strings.xml

@@ -111,24 +111,30 @@
     <string name="title_advanced_section_misc">Miscellaneous</string>
 
     <string name="title_advanced_enabled">Synchronize</string>
+
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_download">Automatically download messages and attachments on a metered connection up to</string>
+    <string name="title_advanced_browse">Browse messages on the server</string>
+
     <string name="title_advanced_unified">Unified inbox</string>
     <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
+
     <string name="title_advanced_light">Use notification light</string>
     <string name="title_advanced_sound">Select notification sound</string>
-    <string name="title_advanced_browse">Browse messages on the server</string>
+
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
     <string name="title_advanced_autoclose">Automatically close conversations</string>
+    <string name="title_advanced_autoread">Automatically mark message read on moving message</string>
     <string name="title_advanced_collapse">Collapse messages in conversations on \'back\'</string>
     <string name="title_advanced_automove">Confirm moving messages</string>
     <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
     <string name="title_advanced_sender">Allow editing sender address</string>
-    <string name="title_advanced_download">Automatically download messages and attachments on a metered connection up to</string>
+
     <string name="title_advanced_updates">Check for updates</string>
     <string name="title_advanced_debug">Debug mode</string>