diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 130fe4bcf3..3687da7246 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1672,6 +1672,10 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(sendgrid))
             return "sendgrid";
 
+        String mailgun = imessage.getHeader("X-Mailgun-Sid", null);
+        if (!TextUtils.isEmpty(mailgun))
+            return "mailgun";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_mailgun.xml b/app/src/main/res/drawable/infra_mailgun.xml
new file mode 100644
index 0000000000..e284d4da41
--- /dev/null
+++ b/app/src/main/res/drawable/infra_mailgun.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1dp"
+    android:height="1dp"
+    android:viewportWidth="256"
+    android:viewportHeight="257">
+  <path
+      android:pathData="M128.418,80.526c-26.51,0 -48.884,21.475 -48.884,48.728a48.197,48.197 0,0 0,14.187 34.579a48.532,48.532 0,0 0,34.697 14.14c26.511,0 48.875,-21.476 48.875,-48.719c0,-27.253 -22.364,-48.728 -48.875,-48.728zM52.198,128.421c0,-41.285 33.968,-75.138 75.395,-75.138c41.417,0 75.385,33.853 75.385,75.138c0,2.478 0,5.788 -0.825,8.266c-0.835,7.422 4.972,13.2 12.43,13.2c12.43,0 14.08,-15.678 14.08,-21.466c0,-55.328 -45.573,-100.746 -101.07,-100.746c-55.518,0 -101.07,45.418 -101.07,100.746c0,55.339 45.552,100.747 101.07,100.747c29.822,0 56.333,-12.388 74.56,-33.03l20.703,17.342c-22.364,26.43 -57.158,42.952 -94.448,42.952c-34.097,0.105 -66.827,-13.35 -90.932,-37.384C13.37,195.016 -0.118,162.392 0,128.411C0,58.228 57.159,0.432 128.418,0.432C198.832,0.432 256,58.238 256,128.432c0,28.075 -13.256,51.205 -40.591,51.205c-11.605,0 -19.053,-5.787 -23.2,-11.565c-13.255,21.476 -37.29,35.508 -64.626,35.508c-20.017,0.068 -39.234,-7.827 -53.388,-21.933a74.755,74.755 0,0 1,-22.008 -53.205l0.01,-0.02zM128.408,106.124c12.43,0 22.374,9.91 22.374,22.297c0,12.388 -9.944,22.298 -22.364,22.298a22.322,22.322 0,0 1,-15.848 -6.504a22.169,22.169 0,0 1,-6.526 -15.794c0,-12.387 9.944,-22.297 22.374,-22.297h-0.01z"
+      android:fillColor="#C02428"/>
+</vector>