diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 658e513a09..c48334a51e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1712,6 +1712,10 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(elastic))
             return "elastic";
 
+        String zeptomail = imessage.getHeader("X-JID", null); // TM-MAIL-JID
+        if (!TextUtils.isEmpty(zeptomail))
+            return "zeptomail";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_zeptomail.png b/app/src/main/res/drawable/infra_zeptomail.png
new file mode 100644
index 0000000000..dc0f531115
Binary files /dev/null and b/app/src/main/res/drawable/infra_zeptomail.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7c71260a0..78c676fc55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1818,6 +1818,7 @@
     <string name="infra_sendgrid" translatable="false">SendGrid</string>
     <string name="infra_sendinblue" translatable="false">Sendinblue</string>
     <string name="infra_sparkpost" translatable="false">Sparkpost</string>
+    <string name="infra_zeptomail" translatable="false">Zeptomail/Zoho</string>
 
     <string-array name="pollIntervalNames">
         <item>Always</item>