diff --git a/app/src/main/java/eu/faircode/email/EntityLog.java b/app/src/main/java/eu/faircode/email/EntityLog.java
index da41a7f882..ad398d8ac3 100644
--- a/app/src/main/java/eu/faircode/email/EntityLog.java
+++ b/app/src/main/java/eu/faircode/email/EntityLog.java
@@ -49,7 +49,7 @@ public class EntityLog {
     private static Long last_cleanup = null;
 
     private static final long LOG_CLEANUP_INTERVAL = 3600 * 1000L; // milliseconds
-    private static final long LOG_KEEP_DURATION = 12 * 3600 * 1000L; // milliseconds
+    private static final long LOG_KEEP_DURATION = (BuildConfig.DEBUG ? 24 : 12) * 3600 * 1000L; // milliseconds
     private static final int LOG_DELETE_BATCH_SIZE = 50;
 
     @PrimaryKey(autoGenerate = true)