diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 57ee04b9f2..80ef27dbe3 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -254,6 +254,8 @@ public class EntityRule {
                         keywords.add("$flagged");
                     if (message.ui_deleted)
                         keywords.add("$deleted");
+                    if (message.infrastructure != null)
+                        keywords.add('@' + message.infrastructure);
                     keywords.addAll(Arrays.asList(message.keywords));
 
                     if (!keywords.contains(keyword))