diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 53c7ee7df5..955de6db79 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1720,6 +1720,14 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(xmailer) && xmailer.contains("PHPMailer"))
             return "phpmailer";
 
+        String gmail = imessage.getHeader("X-Gm-Message-State", null);
+        if (!TextUtils.isEmpty(gmail))
+            return "gmail";
+
+        String outlook = imessage.getHeader("x-ms-publictraffictype", null);
+        if (!TextUtils.isEmpty(outlook))
+            return "outlook";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_gmail.xml b/app/src/main/res/drawable/infra_gmail.xml
new file mode 100644
index 0000000000..c43526d076
--- /dev/null
+++ b/app/src/main/res/drawable/infra_gmail.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="88dp"
+    android:height="66dp"
+    android:viewportWidth="88"
+    android:viewportHeight="66">
+  <path
+      android:pathData="M6,66h14L20,32L0,17v43c0,3.32 2.69,6 6,6"
+      android:fillColor="#4285f4"/>
+  <path
+      android:pathData="M68,66h14c3.32,0 6,-2.69 6,-6L88,17l-20,15"
+      android:fillColor="#34a853"/>
+  <path
+      android:pathData="M68,6v26l20,-15v-8c0,-7.42 -8.47,-11.65 -14.4,-7.2"
+      android:fillColor="#fbbc04"/>
+  <path
+      android:pathData="M20,32L20,6l24,18 24,-18v26L44,50"
+      android:fillColor="#ea4335"/>
+  <path
+      android:pathData="M0,9v8l20,15L20,6l-5.6,-4.2c-5.94,-4.45 -14.4,-0.22 -14.4,7.2"
+      android:fillColor="#c5221f"/>
+</vector>
diff --git a/app/src/main/res/drawable/infra_outlook.xml b/app/src/main/res/drawable/infra_outlook.xml
new file mode 100644
index 0000000000..93600cc192
--- /dev/null
+++ b/app/src/main/res/drawable/infra_outlook.xml
@@ -0,0 +1,107 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="1831.085dp"
+    android:height="1703.335dp"
+    android:viewportWidth="1831.085"
+    android:viewportHeight="1703.335">
+  <path
+      android:pathData="M1831.08,894.25c0.1,-14.32 -7.3,-27.64 -19.5,-35.13h-0.21l-0.77,-0.43l-634.49,-375.58c-2.74,-1.85 -5.58,-3.54 -8.52,-5.07c-24.5,-12.64 -53.6,-12.64 -78.1,0c-2.93,1.52 -5.78,3.22 -8.52,5.07L446.49,858.69l-0.77,0.43c-19.39,12.06 -25.34,37.56 -13.28,56.95c3.55,5.71 8.45,10.47 14.26,13.87l634.49,375.58c2.75,1.84 5.59,3.53 8.52,5.07c24.5,12.64 53.6,12.64 78.1,0c2.92,-1.54 5.77,-3.23 8.52,-5.07l634.49,-375.58C1823.49,922.54 1831.23,908.92 1831.08,894.25z"
+      android:fillColor="#0A2767"/>
+  <path
+      android:pathData="M520.45,643.48h416.38v381.67h-416.38V643.48zM1745.92,255.5V80.91c1,-43.65 -33.55,-79.86 -77.2,-80.91H588.2C544.55,1.05 510,37.26 511,80.91V255.5l638.75,170.33L1745.92,255.5z"
+      android:fillColor="#0364B8"/>
+  <path
+      android:pathData="M511,255.5h425.83v383.25H511V255.5z"
+      android:fillColor="#0078D4"/>
+  <path
+      android:pathData="M1362.67,255.5H936.83v383.25L1362.67,1022h383.25V638.75L1362.67,255.5z"
+      android:fillColor="#28A8EA"/>
+  <path
+      android:pathData="M936.83,638.75h425.83V1022H936.83V638.75z"
+      android:fillColor="#0078D4"/>
+  <path
+      android:pathData="M936.83,1022h425.83v383.25H936.83V1022z"
+      android:fillColor="#0364B8"/>
+  <path
+      android:pathData="M520.45,1025.15h416.38v346.97h-416.38V1025.15z"
+      android:fillColor="#14447D"/>
+  <path
+      android:pathData="M1362.67,1022h383.25v383.25h-383.25V1022z"
+      android:fillColor="#0078D4"/>
+  <path
+      android:pathData="M1811.58,927.59l-0.81,0.43l-634.49,356.85c-2.77,1.7 -5.58,3.32 -8.52,4.77c-10.78,5.13 -22.48,8.03 -34.41,8.52l-34.66,-20.27c-2.93,-1.47 -5.77,-3.11 -8.52,-4.9L447.17,906h-0.3l-21.04,-11.75v722.38c0.33,48.2 39.65,87.01 87.85,86.7h1230.91c0.72,0 1.36,-0.34 2.13,-0.34c10.18,-0.65 20.22,-2.74 29.81,-6.22c4.14,-1.76 8.15,-3.84 11.97,-6.22c2.85,-1.62 7.75,-5.15 7.75,-5.15c21.81,-16.14 34.73,-41.63 34.83,-68.77V894.25C1831.07,908.07 1823.62,920.81 1811.58,927.59z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="894.25006"
+          android:startX="1128.4584"
+          android:endY="1703.3352"
+          android:endX="1128.4584"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF35B8F1"/>
+        <item android:offset="1" android:color="#FF28A8EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M1797.02,891.4v44.29l-663.45,456.79L446.7,906.3c0,-0.23 -0.19,-0.43 -0.43,-0.43l0,0l-63.02,-37.9v-31.94l25.98,-0.43l54.93,31.51l1.28,0.43l4.68,2.98c0,0 645.56,368.35 647.27,369.2l24.7,14.48c2.13,-0.85 4.26,-1.7 6.81,-2.56c1.28,-0.85 640.88,-360.68 640.88,-360.68L1797.02,891.4z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#0A2767"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M1811.58,927.59l-0.81,0.47l-634.49,356.85c-2.77,1.7 -5.58,3.32 -8.52,4.77c-24.64,12.04 -53.46,12.04 -78.1,0c-2.92,-1.45 -5.76,-3.04 -8.52,-4.77L446.66,928.06l-0.77,-0.47c-12.25,-6.64 -19.93,-19.41 -20.06,-33.34v722.38c0.31,48.19 39.62,87 87.8,86.7c0,0 0,0 0,0h1229.64c48.19,0.31 87.5,-38.51 87.81,-86.7c0,-0 0,-0 0,-0V894.25C1831.07,908.07 1823.62,920.81 1811.58,927.59z"
+      android:fillColor="#1490DF"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M1185.52,1279.63l-9.5,5.32c-2.75,1.75 -5.59,3.36 -8.52,4.81c-10.46,5.14 -21.84,8.15 -33.47,8.86l241.4,285.48l421.11,101.48c11.54,-8.72 20.72,-20.18 26.7,-33.34L1185.52,1279.63z"
+      android:strokeAlpha="0.1"
+      android:fillAlpha="0.1"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M1228.53,1255.44l-52.51,29.51c-2.75,1.75 -5.59,3.36 -8.52,4.81c-10.46,5.14 -21.84,8.15 -33.47,8.86l113.1,311.84l549.54,74.99c21.65,-16.25 34.39,-41.74 34.41,-68.82v-9.33L1228.53,1255.44z"
+      android:strokeAlpha="0.05"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M514.83,1703.33h1228.32c18.9,0.1 37.33,-5.87 52.59,-17.03l-697.09,-408.33c-2.93,-1.47 -5.77,-3.11 -8.52,-4.9L447.13,906.09h-0.3l-20.99,-11.84v719.91C425.79,1663.36 465.63,1703.29 514.83,1703.33C514.83,1703.33 514.83,1703.33 514.83,1703.33z"
+      android:fillColor="#28A8EA"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M1022,418.72v908.3c-0.08,31.85 -19.44,60.47 -48.97,72.39c-9.15,3.93 -19,5.96 -28.96,5.96H425.83V383.25H511v-42.58h433.07C987.09,340.83 1021.91,375.7 1022,418.72z"
+      android:strokeAlpha="0.1"
+      android:fillAlpha="0.1"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M979.42,461.3v908.3c0.11,10.29 -2.07,20.47 -6.39,29.81c-11.83,29.15 -40.08,48.27 -71.54,48.42H425.83V383.25h475.66c12.36,-0.12 24.53,2.96 35.34,8.94C962.94,405.34 979.41,432.08 979.42,461.3z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M979.42,461.3v823.14c-0.21,43 -34.93,77.85 -77.93,78.22H425.83V383.25h475.66c12.36,-0.12 24.53,2.96 35.34,8.94C962.94,405.34 979.41,432.08 979.42,461.3z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M936.83,461.3v823.14c-0.05,43.07 -34.86,78.01 -77.93,78.22H425.83V383.25h433.07c43.06,0.02 77.95,34.95 77.93,78.01C936.83,461.28 936.83,461.29 936.83,461.3z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M78.06,383.25h780.72c43.11,0 78.06,34.95 78.06,78.06v780.72c0,43.11 -34.95,78.06 -78.06,78.06H78.06c-43.11,0 -78.06,-34.95 -78.06,-78.06V461.3C0,418.2 34.95,383.25 78.06,383.25z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="322.25928"
+          android:startX="162.7469"
+          android:endY="1381.0742"
+          android:endX="774.0864"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF1784D9"/>
+        <item android:offset="0.5" android:color="#FF107AD5"/>
+        <item android:offset="1" android:color="#FF0A63C9"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M243.96,710.63c19.24,-40.99 50.29,-75.29 89.17,-98.5c43.06,-24.65 92.08,-36.94 141.68,-35.51c45.97,-1 91.32,10.65 131.11,33.68c37.41,22.31 67.55,55 86.74,94.11c20.9,43.09 31.32,90.51 30.41,138.4c1.01,50.04 -9.71,99.63 -31.3,144.78c-19.65,40.5 -50.74,74.36 -89.43,97.39c-41.33,23.73 -88.37,35.69 -136.01,34.58c-46.95,1.13 -93.3,-10.65 -134.01,-34.07c-37.74,-22.34 -68.25,-55.07 -87.89,-94.28c-21.03,-42.47 -31.57,-89.36 -30.75,-136.74C212.81,804.86 223.16,755.69 243.96,710.63zM339.01,941.86c10.26,25.91 27.65,48.38 50.16,64.81c22.93,16.03 50.39,24.29 78.35,23.59c29.78,1.18 59.14,-7.37 83.63,-24.36c22.23,-16.38 39.16,-38.91 48.72,-64.81c10.68,-28.93 15.95,-59.57 15.54,-90.4c0.33,-31.13 -4.62,-62.08 -14.65,-91.55c-8.85,-26.61 -25.25,-50.07 -47.18,-67.54c-23.88,-17.79 -53.16,-26.81 -82.91,-25.55c-28.57,-0.74 -56.64,7.59 -80.18,23.8c-22.89,16.5 -40.62,39.17 -51.1,65.36c-23.25,60.05 -23.38,126.6 -0.34,186.73L339.01,941.86z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M1362.67,255.5h383.25v383.25h-383.25V255.5z"
+      android:fillColor="#50D9FF"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b3f18bc55b..3a64f64067 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1821,6 +1821,9 @@
     <string name="infra_sparkpost" translatable="false">Sparkpost</string>
     <string name="infra_zeptomail" translatable="false">Zeptomail/Zoho</string>
 
+    <string name="infra_gmail" translatable="false">Gmail</string>
+    <string name="infra_outlook" translatable="false">Outlook/Office 365</string>
+
     <string-array name="pollIntervalNames">
         <item>Always</item>
         <item>Every 5 minutes</item>