diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 6822a075c8..658e513a09 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1708,6 +1708,10 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(netcore))
             return "netcore";
 
+        String elastic = imessage.getHeader("X-Msg-EID", null);
+        if (!TextUtils.isEmpty(elastic))
+            return "elastic";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_elastic.xml b/app/src/main/res/drawable/infra_elastic.xml
new file mode 100644
index 0000000000..d2ef70247b
--- /dev/null
+++ b/app/src/main/res/drawable/infra_elastic.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M20,-0.005h20v20a20,20 0,0 1,-20 20h0a20,20 0,0 1,-20 -20h0A20,20 0,0 1,20 -0.005Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="33.235"
+          android:startX="6.7599998"
+          android:endY="2.6750002"
+          android:endX="37.32"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF4FD1C5"/>
+        <item android:offset="1" android:color="#FF5457FF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M20,32.73a12.73,12.73 0,1 1,0 -25.46h12.73v12.729A12.745,12.745 0,0 1,20 32.73ZM20,13.937a6.063,6.063 0,1 0,6.063 6.063v-6.063Z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c868a2048..d7c71260a0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1807,6 +1807,7 @@
     <string name="title_accessibility_to">Recipient</string>
 
     <string name="infra_awsses" translatable="false">Amazon SES</string>
+    <string name="infra_elastic" translatable="false">Elastic Email</string>
     <string name="infra_mailchimp" translatable="false">Mailchimp</string>
     <string name="infra_mailgun" translatable="false">Mailgun</string>
     <string name="infra_mailjet" translatable="false">Mailjet</string>