diff --git a/FAQ.md b/FAQ.md
index 18d02b2443..3588715d02 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -4474,7 +4474,8 @@ To show shields, the option *Show authentication status indicator* in the displa
 A message will be consired safely transported if *every* [Received](https://datatracker.ietf.org/doc/html/rfc2821#section-4.4) header:
 
 * contains the phrase 'using TLS' or 'version=TLS'
-* contains the phrase 'qmail <nnn> invoked by uid <nnn>'
+* contains the phrase '(qmail <nnn> invoked by uid <nnn>)'
+* contains the phrase '(Postfix, from userid nnn)'
 * has a *by* with a local address
 * has a *from* with a local address
 * has a *via* with the value '[Frontend Transport](https://social.technet.microsoft.com/wiki/contents/articles/50370.exchange-2016-what-is-the-front-end-transport-service-on-the-mailbox-role.aspx)'
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 416432efb0..9a3bd319da 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2090,8 +2090,10 @@ public class MessageHelper {
         }
 
         // (qmail nnn invoked by uid nnn); 1 Jan 2022 00:00:00 -0000
-        if (header.contains("qmail") && header.contains("invoked by uid")) {
-            Log.i("--- found qmail");
+        // by <host name> (Postfix, from userid nnn)
+        if (header.matches(".*\\(qmail \\d+ invoked by uid \\d+\\).*") ||
+                header.matches(".*\\(Postfix, from userid \\d+\\).*")) {
+            Log.i("--- phrase");
             return true;
         }