diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 5ad9ac714f..8ca37b7646 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -1287,7 +1287,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         });
 
         tvUnzipHint.setText(getString(R.string.compressed,
-                TextUtils.join(",", MessageHelper.UNZIP_FORMATS),
+                TextUtils.join(", ", MessageHelper.UNZIP_FORMATS),
                 Integer.toString(MessageHelper.MAX_UNZIP_COUNT),
                 Helper.humanReadableByteCount(MessageHelper.MAX_UNZIP_SIZE)));
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 596cf3c99d..f9018e3eb4 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -183,9 +183,9 @@ public class MessageHelper {
     static final int MAX_UNZIP_COUNT = 20;
     static final long MAX_UNZIP_SIZE = 1000 * 1000 * 1000L;
 
-    static final List<String> UNZIP_FORMATS = BuildConfig.PLAY_STORE_RELEASE
-            ? Collections.unmodifiableList(Arrays.asList("zip"))
-            : Collections.unmodifiableList(Arrays.asList("zip, gz, tar.gz"));
+    static final List<String> UNZIP_FORMATS = Collections.unmodifiableList(Arrays.asList(
+            "zip", "gz", "tar.gz"
+    ));
 
     static final List<String> RECEIVED_WORDS = Collections.unmodifiableList(Arrays.asList(
             "from", "by", "via", "with", "id", "for"