diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 5da53efa6c..f88299f8f8 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -795,8 +795,8 @@ public class EntityRule {
         Expression expression = new Expression(eval, configuration)
                 .with("to", to)
                 .with("from", from)
-                .with("subject", message == null ? null : Arrays.asList(message.subject))
-                .with("text", doc == null ? null : Arrays.asList(doc.text()));
+                .with("subject", message == null ? null : message.subject)
+                .with("text", doc == null ? null : doc.text());
 
         if (message != null) {
             boolean hasAttachments = false;