diff --git a/FAQ.md b/FAQ.md
index 94eaaf8baf..38b4dd5da5 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2510,6 +2510,7 @@ $$blocklist$
 $$replydomain$
 $$nofrom$ (since version 1.1791)
 $$multifrom$ (since version 1.1791)
+$$automatic (since version 1.1862)
 ```
 
 Note that *regex* should be disable and that there should be no white space.
diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index bc741fbadc..18dd4841b7 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -298,6 +298,9 @@ public class EntityRule {
                     } else if ("$multifrom".equals(keyword)) {
                         if (message.from == null || message.from.length < 2)
                             return false;
+                    } else if ("$automatic".equals(keyword)) {
+                        if (!Boolean.TRUE.equals(message.auto_submitted))
+                            return false;
                     } else {
                         List<String> keywords = new ArrayList<>();
                         keywords.addAll(Arrays.asList(message.keywords));
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e16d103dbd..353e584733 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1691,6 +1691,7 @@ public class MessageHelper {
 
     Boolean getAutoSubmitted() throws MessagingException {
         // https://tools.ietf.org/html/rfc3834
+        // auto-generated, auto-replied
         String header = imessage.getHeader("Auto-Submitted", null);
         if (header == null) {
             // https://www.arp242.net/autoreply.html