From e3b467437810749ffaf89545ae9e45cb21039086 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 28 Aug 2018 14:52:03 +0000
Subject: [PATCH] Added IMAP compression (default enabled)

---
 .../java/eu/faircode/email/FragmentAccount.java   |  4 ++--
 .../java/eu/faircode/email/FragmentIdentity.java  |  2 +-
 .../java/eu/faircode/email/FragmentOptions.java   | 10 ++++++++++
 .../java/eu/faircode/email/MessageHelper.java     | 15 ++++++++++++++-
 .../java/eu/faircode/email/SearchDataSource.java  |  2 +-
 .../eu/faircode/email/ServiceSynchronize.java     |  4 ++--
 app/src/main/res/layout/fragment_options.xml      | 14 +++++++++++++-
 app/src/main/res/values-af/strings.xml            |  1 +
 app/src/main/res/values-ar-rBH/strings.xml        |  1 +
 app/src/main/res/values-ar-rEG/strings.xml        |  1 +
 app/src/main/res/values-ar-rSA/strings.xml        |  1 +
 app/src/main/res/values-ar-rYE/strings.xml        |  1 +
 app/src/main/res/values-ar/strings.xml            |  1 +
 app/src/main/res/values-ca/strings.xml            |  1 +
 app/src/main/res/values-cs/strings.xml            |  1 +
 app/src/main/res/values-da/strings.xml            |  1 +
 app/src/main/res/values-de/strings.xml            |  1 +
 app/src/main/res/values-el/strings.xml            |  1 +
 app/src/main/res/values-en/strings.xml            |  1 +
 app/src/main/res/values-es-rES/strings.xml        |  1 +
 app/src/main/res/values-fi/strings.xml            |  1 +
 app/src/main/res/values-fr/strings.xml            |  3 ++-
 app/src/main/res/values-he/strings.xml            |  1 +
 app/src/main/res/values-hu/strings.xml            |  1 +
 app/src/main/res/values-it/strings.xml            |  1 +
 app/src/main/res/values-iw/strings.xml            |  1 +
 app/src/main/res/values-ja/strings.xml            |  1 +
 app/src/main/res/values-ko/strings.xml            |  1 +
 app/src/main/res/values-nb/strings.xml            |  1 +
 app/src/main/res/values-nl/strings.xml            |  1 +
 app/src/main/res/values-no/strings.xml            |  1 +
 app/src/main/res/values-pl/strings.xml            |  1 +
 app/src/main/res/values-pt-rBR/strings.xml        |  1 +
 app/src/main/res/values-pt-rPT/strings.xml        |  1 +
 app/src/main/res/values-ro/strings.xml            |  1 +
 app/src/main/res/values-ru/strings.xml            |  1 +
 app/src/main/res/values-sr/strings.xml            |  1 +
 app/src/main/res/values-sv-rSE/strings.xml        |  1 +
 app/src/main/res/values-tr/strings.xml            |  1 +
 app/src/main/res/values-uk/strings.xml            |  1 +
 app/src/main/res/values-vi/strings.xml            |  1 +
 app/src/main/res/values-zh-rCN/strings.xml        |  1 +
 app/src/main/res/values-zh-rTW/strings.xml        |  1 +
 app/src/main/res/values/strings.xml               |  1 +
 44 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 6e34d0dbd4..bad149b404 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -255,7 +255,7 @@ public class FragmentAccount extends FragmentEx {
 
                         // Check IMAP server / get folders
                         List<EntityFolder> folders = new ArrayList<>();
-                        Properties props = MessageHelper.getSessionProperties(auth_type);
+                        Properties props = MessageHelper.getSessionProperties(context, auth_type);
                         Session isession = Session.getInstance(props, null);
                         isession.setDebug(true);
                         IMAPStore istore = null;
@@ -481,7 +481,7 @@ public class FragmentAccount extends FragmentEx {
 
                         // Check IMAP server
                         if (synchronize) {
-                            Session isession = Session.getInstance(MessageHelper.getSessionProperties(auth_type), null);
+                            Session isession = Session.getInstance(MessageHelper.getSessionProperties(context, auth_type), null);
                             isession.setDebug(true);
                             IMAPStore istore = null;
                             try {
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index f449a9ec3c..fece2a5cd9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -273,7 +273,7 @@ public class FragmentIdentity extends FragmentEx {
 
                         // Check SMTP server
                         if (synchronize) {
-                            Properties props = MessageHelper.getSessionProperties(auth_type);
+                            Properties props = MessageHelper.getSessionProperties(context, auth_type);
                             Session isession = Session.getInstance(props, null);
                             isession.setDebug(true);
                             Transport itransport = isession.getTransport(starttls ? "smtp" : "smtps");
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index e88317bdb2..1272177d80 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -37,6 +37,7 @@ public class FragmentOptions extends FragmentEx {
     private CheckBox cbWebView;
     private TextView tvCustomTabs;
     private CheckBox cbSanitize;
+    private CheckBox cbCompressImap;
     private CheckBox cbDebug;
 
     @Override
@@ -50,6 +51,7 @@ public class FragmentOptions extends FragmentEx {
         cbWebView = view.findViewById(R.id.cbWebView);
         tvCustomTabs = view.findViewById(R.id.tvCustomTabs);
         cbSanitize = view.findViewById(R.id.cbSanitize);
+        cbCompressImap = view.findViewById(R.id.cbCompressImap);
         cbDebug = view.findViewById(R.id.cbDebug);
 
         // Wire controls
@@ -72,6 +74,14 @@ public class FragmentOptions extends FragmentEx {
             }
         });
 
+        cbCompressImap.setChecked(prefs.getBoolean("compress", true));
+        cbCompressImap.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("compress", checked).apply();
+            }
+        });
+
         cbDebug.setChecked(prefs.getBoolean("debug", false));
         cbDebug.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index f29a1b3bfd..2f2896e14e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -20,6 +20,8 @@ package eu.faircode.email;
 */
 
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
@@ -57,9 +59,11 @@ public class MessageHelper {
     private MimeMessage imessage;
     private String raw = null;
 
-    static Properties getSessionProperties(int auth_type) {
+    static Properties getSessionProperties(Context context, int auth_type) {
         Properties props = new Properties();
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
         // https://javaee.github.io/javamail/docs/api/com/sun/mail/imap/package-summary.html#properties
         props.put("mail.imaps.ssl.checkserveridentity", "true");
         props.put("mail.imaps.ssl.trust", "*");
@@ -72,6 +76,15 @@ public class MessageHelper {
 
         props.put("mail.imaps.connectionpooltimeout", Integer.toString(3 * 60 * 1000)); // default: 45 sec
 
+        // https://tools.ietf.org/html/rfc4978
+        // https://docs.oracle.com/javase/8/docs/api/java/util/zip/Deflater.html
+        if (prefs.getBoolean("compress", true)) {
+            Log.i(Helper.TAG, "IMAP compress enabled");
+            props.put("mail.imaps.compress.enable", "true");
+            //props.put("mail.imaps.compress.level", "-1");
+            //props.put("mail.imaps.compress.strategy", "0");
+        }
+
         // https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html#properties
         props.put("mail.smtps.ssl.checkserveridentity", "true");
         props.put("mail.smtps.ssl.trust", "*");
diff --git a/app/src/main/java/eu/faircode/email/SearchDataSource.java b/app/src/main/java/eu/faircode/email/SearchDataSource.java
index fe52e55fb1..ba9ceead4d 100644
--- a/app/src/main/java/eu/faircode/email/SearchDataSource.java
+++ b/app/src/main/java/eu/faircode/email/SearchDataSource.java
@@ -123,7 +123,7 @@ public class SearchDataSource extends PositionalDataSource<TupleMessageEx> imple
                 db.account().setAccountPassword(account.id, account.password);
             }
 
-            Properties props = MessageHelper.getSessionProperties(account.auth_type);
+            Properties props = MessageHelper.getSessionProperties(context, account.auth_type);
             props.setProperty("mail.imap.throwsearchexception", "true");
             Session isession = Session.getInstance(props, null);
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index e85e876254..8b39303745 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -402,7 +402,7 @@ public class ServiceSynchronize extends LifecycleService {
                 db.account().setAccountPassword(account.id, account.password);
             }
 
-            Properties props = MessageHelper.getSessionProperties(account.auth_type);
+            Properties props = MessageHelper.getSessionProperties(this, account.auth_type);
             final Session isession = Session.getInstance(props, null);
             isession.setDebug(debug);
             // adb -t 1 logcat | grep "fairemail\|System.out"
@@ -987,7 +987,7 @@ public class ServiceSynchronize extends LifecycleService {
         }
 
         // Create session
-        Properties props = MessageHelper.getSessionProperties(ident.auth_type);
+        Properties props = MessageHelper.getSessionProperties(this, ident.auth_type);
         final Session isession = Session.getInstance(props, null);
 
         // Create message
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 8e45532af1..8ef26dc384 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -45,6 +45,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCustomTabs" />
 
+        <CheckBox
+            android:id="@+id/cbCompressImap"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_compress_imap"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorSecondary"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbSanitize" />
+
         <CheckBox
             android:id="@+id/cbDebug"
             android:layout_width="wrap_content"
@@ -55,6 +67,6 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbSanitize" />
+            app:layout_constraintTop_toBottomOf="@id/cbCompressImap" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 685f69280b..b390436032 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -70,6 +70,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 685f69280b..b390436032 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -70,6 +70,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 685f69280b..b390436032 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -70,6 +70,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 685f69280b..b390436032 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -70,6 +70,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 685f69280b..b390436032 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -70,6 +70,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 741a183578..3b5ec76efe 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -62,6 +62,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index ef867fe2eb..3efae4d7a0 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">I stedet for <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome tilpasset faner</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Dit navn</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 92f796fdc9..d050b63e58 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Anstatt <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome benutzerdefinierte Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debuggen</string>
   <string name="title_select">Wählen Sie &#8230;</string>
   <string name="title_identity_name">Ihr Name</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 05a7206880..077908e364 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Utiliser WebView pour afficher les liens externes</string>
   <string name="title_advanced_customtabs">Au lieu des <a href="https://developer.chrome.com/multidevice/android/customtabs">onglets personnalisés Chrome</a></string>
   <string name="title_advanced_sanitize">Supprimer le formatage HTML des messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Débogage</string>
   <string name="title_select">Sélectionner &#8230;</string>
   <string name="title_identity_name">Votre nom</string>
@@ -161,7 +162,7 @@
   <string name="title_legend_disconnected">Déconnecté</string>
   <string name="title_legend_connecting">Connexion en cours</string>
   <string name="title_legend_connected">Connecté</string>
-  <string name="title_legend_synchronizing">Synchronizing</string>
+  <string name="title_legend_synchronizing">Synchronisation en cours</string>
   <string name="title_legend_closing">Fermeture en cours</string>
   <string name="title_hint_swipe">Balayer à gauche pour supprimer et balayer à droite pour archiver (si disponible)</string>
   <string name="title_understood">Compris</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index a9ea88a128..a2e66a8518 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -62,6 +62,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 779fbe1913..33d2e17867 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Al posto di <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Il tuo nome</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index a9ea88a128..a2e66a8518 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -62,6 +62,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 84c41176f6..3257e2f51c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -50,6 +50,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 84c41176f6..3257e2f51c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -50,6 +50,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 38555f8abb..b7a3403bd9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -62,6 +62,7 @@
   <string name="title_advanced_webview">Użyj WebView do pokazywania zewnętrznych linków</string>
   <string name="title_advanced_customtabs">Zamiast <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Usuń formatowanie HTML z wiadomości</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Wybierz &#8230;</string>
   <string name="title_identity_name">Twoja nazwa</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8e82ee9d5a..9e67c09a7f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a5be9cdfff..266e9ead74 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -58,6 +58,7 @@
   <string name="title_advanced_webview">Folosește WebView pentru legăturile externe</string>
   <string name="title_advanced_customtabs">în loc de <a href="https://developer.chrome.com/multidevice/android/customtabs">tab Chrome personalizat</a></string>
   <string name="title_advanced_sanitize">Înlătură formatarea HTML din mesaje</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Depanare</string>
   <string name="title_select">Selectaţi &#8230;</string>
   <string name="title_identity_name">Numele dumneavoastră</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 741a183578..3b5ec76efe 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -62,6 +62,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 5ad1a36358..6e1965347d 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -58,6 +58,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 74445e068e..c074d0d621 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -54,6 +54,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 741a183578..3b5ec76efe 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -62,6 +62,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 84c41176f6..3257e2f51c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -50,6 +50,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 84c41176f6..3257e2f51c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -50,6 +50,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 84c41176f6..3257e2f51c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -50,6 +50,7 @@
   <string name="title_advanced_webview">Use WebView to show external links</string>
   <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
   <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+  <string name="title_advanced_compress_imap">Compress IMAP data</string>
   <string name="title_advanced_debug">Debug</string>
   <string name="title_select">Select &#8230;</string>
   <string name="title_identity_name">Your name</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 66941476c3..e3900c1849 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,6 +69,7 @@
     <string name="title_advanced_webview">Use WebView to show external links</string>
     <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
     <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
+    <string name="title_advanced_compress_imap">Compress IMAP data</string>
     <string name="title_advanced_debug">Debug</string>
 
     <string name="title_select">Select &#8230;</string>