diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java
index 46c7805244..848e79844c 100644
--- a/app/src/main/java/eu/faircode/email/MessageClassifier.java
+++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java
@@ -88,9 +88,11 @@ public class MessageClassifier {
             long elapsed = new Date().getTime() - start;
             EntityLog.log(context, EntityLog.Type.Classification, message,
                     "Classifier" +
-                            " folder=" + folder.name +
+                            " folder=" + folder.account + ":" + folder.name + ":" + folder.type +
                             " added=" + added +
-                            " message=" + message.id +
+                            " message=" + message.id + "/" + !TextUtils.isEmpty(message.msgid) +
+                            " keyword=" + message.hasKeyword(MessageHelper.FLAG_CLASSIFIED) +
+                            " filtered=" + message.hasKeyword(MessageHelper.FLAG_FILTERED) +
                             "@" + new Date(message.received) +
                             ":" + message.subject +
                             " class=" + classified +