diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 35cc6690ea..ea7fc2b095 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -2609,6 +2609,8 @@ public class Log {
             }
 
             db.attachment().setDownloaded(attachment.id, size);
+            if (!BuildConfig.DEBUG)
+                attachment.zip(context);
         } catch (Throwable ex) {
             Log.e(ex);
         }
@@ -2717,6 +2719,8 @@ public class Log {
                 }
 
                 db.attachment().setDownloaded(attachment.id, size);
+                if (!BuildConfig.DEBUG)
+                    attachment.zip(context);
             } finally {
                 if (proc != null)
                     proc.destroy();