diff --git a/app/src/main/java/eu/faircode/email/EntityLog.java b/app/src/main/java/eu/faircode/email/EntityLog.java
index 5c84981006..518a7e0c12 100644
--- a/app/src/main/java/eu/faircode/email/EntityLog.java
+++ b/app/src/main/java/eu/faircode/email/EntityLog.java
@@ -64,7 +64,7 @@ public class EntityLog {
     @NonNull
     public String data;
 
-    enum Type {General, Statistics, Scheduling, Network, Account, Protocol, Classification, Notification, Rules}
+    enum Type {General, Statistics, Scheduling, Network, Account, Protocol, Classification, Notification, Rules, Debug}
 
     private static final ExecutorService executor =
             Helper.getBackgroundExecutor(1, "log");
@@ -111,6 +111,9 @@ public class EntityLog {
 
         if (context == null)
             return;
+        if (type == Type.Debug &&
+                !(BuildConfig.DEBUG || BuildConfig.TEST_RELEASE))
+            return;
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean main_log = prefs.getBoolean("main_log", true);
@@ -220,6 +223,8 @@ public class EntityLog {
                 return ContextCompat.getColor(context, R.color.solarizedBlue);
             case Rules:
                 return ContextCompat.getColor(context, R.color.solarizedCyan);
+            case Debug:
+                return Helper.resolveColor(context, R.attr.colorWarning);
             default:
                 return null;
         }