diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 570cd592b5..9fff4d920d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1716,10 +1716,6 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(zeptomail))
             return "zeptomail";
 
-        String xmailer = imessage.getHeader("X-Mailer", null);
-        if (!TextUtils.isEmpty(xmailer) && xmailer.contains("PHPMailer"))
-            return "phpmailer";
-
         String gmail = imessage.getHeader("X-Gm-Message-State", null);
         if (!TextUtils.isEmpty(gmail))
             return "gmail";
@@ -1733,9 +1729,23 @@ public class MessageHelper {
             return "yahoo";
 
         String icloud = imessage.getHeader("X-Proofpoint-Spam-Details", null);
-        if (!TextUtils.isEmpty(icloud)) // X-Mailer: iPhone Mail ...
+        if (!TextUtils.isEmpty(icloud))
             return "icloud";
 
+        String zoho = imessage.getHeader("X-ZohoMailClient", null);
+        if (!TextUtils.isEmpty(zoho))
+            return "zoho";
+
+        String xmailer = imessage.getHeader("X-Mailer", null);
+        if (!TextUtils.isEmpty(xmailer)) {
+            if (xmailer.contains("iPhone Mail"))
+                return "icloud";
+            if (xmailer.contains("PHPMailer"))
+                return "phpmailer";
+            if (xmailer.contains("Zoho Mail"))
+                return "zoho";
+        }
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_zoho.xml b/app/src/main/res/drawable/infra_zoho.xml
new file mode 100644
index 0000000000..2233c0aa04
--- /dev/null
+++ b/app/src/main/res/drawable/infra_zoho.xml
@@ -0,0 +1,94 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="290.01dp"
+    android:height="100dp"
+    android:viewportWidth="290.01"
+    android:viewportHeight="100">
+  <path
+      android:pathData="m290.005,21.355l0,68.786l-9.498,9.267l0,-67.266l9.498,-10.787"
+      android:fillColor="#e79224"/>
+  <path
+      android:pathData="m280.659,32.142l-62.895,-0l0,67.348l62.895,-0z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="33.074677"
+          android:startX="249.21321"
+          android:endY="97.43047"
+          android:endX="249.21321"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFE500"/>
+        <item android:offset="1" android:color="#FFFCB822"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m227.615,21.402 l-9.852,10.742l62.895,-0l9.345,-10.787 -62.389,0.045"
+      android:fillColor="#fef26f"/>
+  <path
+      android:pathData="M149.718,24.352 L211.585,15.751 206.409,30.586 147.799,39.881 148.048,29.277 149.718,24.352"
+      android:fillColor="#91c9ed"/>
+  <path
+      android:pathData="m206.409,30.583 l8.571,60.337 -61.003,8.572 -8.237,-58.331 3.562,-2.783 57.109,-7.792">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="39.88237"
+          android:startX="148.8644"
+          android:endY="90.55228"
+          android:endX="211.95892"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF168CCC"/>
+        <item android:offset="1" android:color="#FF00649E"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m211.587,15.75 l0.048,0.364 8.024,61.782 -4.677,13.024 -8.571,-60.337"
+      android:fillColor="#0b9ad6"/>
+  <group>
+    <clip-path
+        android:pathData="m97.466,19.205 l54.771,24.713 -24.714,56.103 -54.771,-24.712 24.714,-56.107"/>
+    <path
+        android:pathData="m0,-0l290.005,-0l0,100l-290.005,-0z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="41.652836"
+            android:startX="112.491425"
+            android:endY="98.03368"
+            android:endX="112.491425"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF25A149"/>
+          <item android:offset="1" android:color="#FF008A52"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+  <path
+      android:pathData="M91.778,-0 L97.464,19.204 152.234,43.917 147.63,25.567 91.778,-0"
+      android:fillColor="#98d0a0"/>
+  <path
+      android:pathData="m91.778,-0 l-22.044,52.319 3.016,22.991L97.464,19.204 91.778,-0"
+      android:fillColor="#68bf6b"/>
+  <path
+      android:pathData="m61.222,30.497 l9.027,59.373 -60.529,9.491 -9.722,-59.487 61.222,-9.374">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="36.133827"
+          android:startX="30.703552"
+          android:endY="94.669014"
+          android:endX="40.399616"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFD92231"/>
+        <item android:offset="1" android:color="#FFBA2234"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M0,39.871 L4.251,18.672 65.366,8.876 61.224,30.497 0,39.871"
+      android:fillColor="#ef463d"/>
+  <path
+      android:pathData="M65.366,8.876 L74.327,68.822 70.252,89.868 61.224,30.496 65.366,8.876"
+      android:fillColor="#761116"/>
+  <path
+      android:pathData="m196.033,42.146c-0.275,-1.874 -0.915,-3.304 -1.953,-4.24 -0.825,-0.748 -1.862,-1.126 -3.044,-1.124 -0.302,-0 -0.612,0.024 -0.935,0.071 -1.584,0.228 -2.797,0.961 -3.54,2.172 -0.541,0.875 -0.803,1.931 -0.803,3.145 0,0.465 0.039,0.955 0.115,1.469l2.225,15.7 -17.54,2.581 -2.225,-15.703c-0.269,-1.825 -0.9,-3.241 -1.923,-4.203 -0.826,-0.78 -1.856,-1.179 -3.018,-1.176 -0.274,-0 -0.556,0.022 -0.843,0.064 -1.651,0.238 -2.908,0.958 -3.672,2.151 -0.554,0.859 -0.821,1.92 -0.821,3.154 0,0.474 0.04,0.974 0.117,1.502l6.002,40.83c0.275,1.877 0.932,3.304 2.011,4.226 0.842,0.72 1.897,1.083 3.106,1.08 0.33,-0 0.674,-0.026 1.028,-0.078 1.51,-0.219 2.676,-0.949 3.38,-2.159 0.504,-0.86 0.749,-1.893 0.749,-3.075 0,-0.473 -0.039,-0.969 -0.116,-1.488l-2.452,-16.132 17.539,-2.578 2.454,16.131c0.27,1.853 0.92,3.271 1.984,4.205 0.845,0.743 1.89,1.118 3.075,1.116 0.304,-0 0.616,-0.023 0.938,-0.071 1.578,-0.23 2.786,-0.952 3.508,-2.154 0.52,-0.857 0.77,-1.896 0.77,-3.094 0,-0.474 -0.038,-0.973 -0.115,-1.496zM124.697,64.73c-2.064,4.861 -4.788,8.196 -8.159,10.043 -1.807,0.99 -3.658,1.479 -5.573,1.48 -1.664,-0 -3.379,-0.372 -5.15,-1.121 -3.833,-1.634 -6.221,-4.26 -7.255,-7.965 -0.345,-1.243 -0.519,-2.549 -0.519,-3.922 0,-2.719 0.682,-5.702 2.059,-8.947 2.11,-4.976 4.865,-8.371 8.239,-10.23 1.801,-0.993 3.654,-1.486 5.575,-1.486 1.682,-0 3.421,0.376 5.221,1.141 3.809,1.62 6.173,4.253 7.188,7.974 0.33,1.217 0.496,2.497 0.496,3.845 0,2.776 -0.702,5.84 -2.122,9.188zM130.697,40.291c-2.152,-2.269 -4.766,-4.054 -7.831,-5.354 -3.043,-1.293 -6.119,-1.937 -9.219,-1.937l-0.143,0.001c-3.148,0.02 -6.259,0.721 -9.326,2.097l0,-0.001c-3.21,1.397 -6.007,3.352 -8.381,5.863 -2.374,2.509 -4.307,5.528 -5.799,9.043 -1.472,3.475 -2.289,6.951 -2.441,10.429 -0.018,0.393 -0.026,0.787 -0.026,1.179 0,3.069 0.526,6.075 1.577,9.012 1.116,3.101 2.76,5.785 4.929,8.047 2.168,2.262 4.835,4.063 7.991,5.398l0,-0.001c3.018,1.282 6.083,1.924 9.188,1.922l0.08,-0c3.131,-0.014 6.237,-0.685 9.307,-2.004l0.003,-0.001 0.002,-0.001c3.23,-1.441 6.046,-3.422 8.448,-5.93 2.401,-2.51 4.342,-5.52 5.825,-9.016 1.483,-3.496 2.291,-6.976 2.424,-10.438 0.013,-0.334 0.019,-0.667 0.019,-0.999 0,-3.113 -0.55,-6.163 -1.651,-9.147 -1.165,-3.17 -2.826,-5.894 -4.977,-8.163zM54.719,80.416c-0.477,-0.57 -1.119,-0.991 -1.902,-1.265 -0.805,-0.281 -1.778,-0.416 -2.923,-0.416 -1.08,-0 -2.313,0.12 -3.705,0.359l-15.976,2.731c0.169,-1.231 0.78,-2.849 1.858,-4.821 1.204,-2.209 2.979,-4.863 5.324,-7.951l0.001,-0.002c0.805,-1.075 1.42,-1.897 1.845,-2.464 0.305,-0.378 0.73,-0.934 1.281,-1.669 3.655,-4.794 5.917,-8.698 6.784,-11.762 0.496,-1.737 0.798,-3.488 0.908,-5.251 0.03,-0.483 0.043,-0.962 0.043,-1.437 0,-1.263 -0.103,-2.507 -0.313,-3.731 -0.19,-1.116 -0.465,-2.043 -0.833,-2.788 -0.368,-0.743 -0.835,-1.308 -1.412,-1.665 -0.651,-0.396 -1.566,-0.564 -2.763,-0.566 -0.989,-0 -2.174,0.12 -3.562,0.356l-18.463,3.159c-2.236,0.383 -3.887,1.041 -4.94,2.033 -0.837,0.785 -1.269,1.803 -1.265,2.97 0,0.305 0.028,0.62 0.084,0.946 0.26,1.569 1.077,2.719 2.395,3.304 0.778,0.351 1.718,0.519 2.815,0.519 0.747,-0 1.568,-0.078 2.465,-0.231l15.453,-2.606c0.026,0.273 0.044,0.546 0.044,0.816 0,0.966 -0.167,1.908 -0.502,2.837 -0.459,1.279 -1.605,3.107 -3.431,5.432 -0.517,0.635 -1.31,1.623 -2.378,2.963 -4.167,5.048 -7.152,9.352 -8.958,12.932 0,0.002 0,0.002 -0.001,0.003 0,-0 0,0.002 -0,0.002 -1.282,2.464 -2.172,4.892 -2.66,7.281 -0.284,1.394 -0.428,2.732 -0.428,4.016 0,0.919 0.074,1.809 0.221,2.671 0.212,1.236 0.517,2.255 0.928,3.063 0.411,0.804 0.935,1.405 1.582,1.761 0.602,0.327 1.488,0.456 2.706,0.46 1.547,-0 3.629,-0.228 6.265,-0.678l16.752,-2.864c2.967,-0.51 5.03,-1.218 6.229,-2.203 0.958,-0.787 1.454,-1.867 1.449,-3.14 0,-0.322 -0.03,-0.655 -0.09,-1 -0.141,-0.826 -0.447,-1.535 -0.924,-2.104zM40.521,64.917 L40.522,64.917c-0.001,0.001 -0.001,0.002 -0.002,0.002l-0.001,-0zM258.132,78.565c-2.41,2.912 -5.655,4.358 -9.844,4.362 -4.217,-0.005 -7.476,-1.445 -9.899,-4.343 -2.416,-2.9 -3.639,-6.886 -3.64,-12.004 0.002,-5.215 1.22,-9.261 3.623,-12.183 2.409,-2.921 5.677,-4.372 9.917,-4.377 4.189,0.005 7.433,1.455 9.844,4.377 2.405,2.922 3.625,6.969 3.625,12.183 0,5.093 -1.217,9.076 -3.625,11.984zM271.059,56.371c-1.245,-3.127 -3.087,-5.931 -5.524,-8.405 -2.332,-2.378 -4.954,-4.173 -7.848,-5.377 -2.898,-1.205 -6.03,-1.807 -9.394,-1.806 -3.387,-0.001 -6.55,0.6 -9.47,1.805 -2.919,1.205 -5.539,3.001 -7.848,5.379 -2.433,2.449 -4.268,5.243 -5.486,8.369 -1.218,3.129 -1.828,6.542 -1.828,10.234 0,3.644 0.612,7.045 1.848,10.195 1.23,3.15 3.055,5.978 5.467,8.475 2.26,2.335 4.853,4.102 7.759,5.294 2.908,1.191 6.098,1.787 9.559,1.787 3.337,-0 6.466,-0.596 9.372,-1.787 2.908,-1.191 5.535,-2.957 7.868,-5.291 2.438,-2.499 4.28,-5.319 5.525,-8.459 1.246,-3.137 1.868,-6.545 1.868,-10.214s-0.622,-7.071 -1.868,-10.199"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 482668402b..13d26c9088 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1827,6 +1827,7 @@
     <string name="infra_sparkpost" translatable="false">Sparkpost</string>
     <string name="infra_yahoo" translatable="false">Yahoo!</string>
     <string name="infra_zeptomail" translatable="false">Zeptomail/Zoho</string>
+    <string name="infra_zoho" translatable="false">Zoho</string>
 
     <string-array name="pollIntervalNames">
         <item>Always</item>