diff --git a/FAQ.md b/FAQ.md
index 3588715d02..2febfef413 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -4477,6 +4477,7 @@ A message will be consired safely transported if *every* [Received](https://data
 * 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 *by* xxx.google.com
 * 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)'
 * has a *with* with the value 'TLS'
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 9a3bd319da..62e60c71a4 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2122,6 +2122,8 @@ public class MessageHelper {
         // Check if 'by' local address
         if (kv.containsKey("by")) {
             String by = kv.get("by").toString();
+            if (by.matches(".*\\.google\\.com"))
+                return true;
             if (isLocal(by)) {
                 Log.i("--- local by=" + by);
                 return true;