diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index df4b1ccc7b..797b900597 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1680,6 +1680,10 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(mandrill))
             return "mandrill";
 
+        String mailchimp = imessage.getHeader("X-MC-User", null);
+        if (!TextUtils.isEmpty(mailchimp))
+            return "mailchimp";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_mailchimp.xml b/app/src/main/res/drawable/infra_mailchimp.xml
new file mode 100644
index 0000000000..4a2b6c38f9
--- /dev/null
+++ b/app/src/main/res/drawable/infra_mailchimp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M17.98,11.341c0.165,-0.021 0.332,-0.021 0.497,0 0.089,-0.205 0.104,-0.558 0.024,-0.942 -0.12,-0.571 -0.28,-0.917 -0.613,-0.863 -0.333,0.054 -0.346,0.468 -0.226,1.039 0.067,0.321 0.186,0.596 0.319,0.766zM15.12,11.793c0.239,0.105 0.385,0.174 0.442,0.114 0.037,-0.038 0.026,-0.11 -0.03,-0.203 -0.118,-0.193 -0.36,-0.388 -0.617,-0.497a1.677,1.677 0,0 0,-1.634 0.196c-0.16,0.117 -0.31,0.28 -0.29,0.378 0.008,0.032 0.031,0.056 0.087,0.064 0.132,0.015 0.591,-0.217 1.12,-0.25 0.374,-0.023 0.684,0.094 0.922,0.199zM14.64,12.067c-0.31,0.05 -0.481,0.152 -0.591,0.247 -0.094,0.082 -0.152,0.173 -0.152,0.237l0.024,0.057 0.051,0.02c0.07,0 0.228,-0.064 0.228,-0.064a1.975,1.975 0,0 1,1 -0.104c0.155,0.018 0.23,0.028 0.263,-0.026 0.01,-0.015 0.023,-0.049 -0.008,-0.1 -0.073,-0.118 -0.387,-0.317 -0.814,-0.266zM17.015,13.073c0.21,0.104 0.442,0.063 0.518,-0.09 0.076,-0.155 -0.034,-0.364 -0.245,-0.467 -0.21,-0.104 -0.442,-0.063 -0.518,0.09 -0.076,0.155 0.034,0.364 0.245,0.467zM18.37,11.887c-0.171,-0.003 -0.314,0.185 -0.317,0.421 -0.004,0.235 0.131,0.428 0.302,0.431 0.171,0.003 0.314,-0.185 0.318,-0.42 0.003,-0.235 -0.132,-0.428 -0.303,-0.432zM6.866,16.13c-0.042,-0.053 -0.112,-0.037 -0.18,-0.021a0.646,0.646 0,0 1,-0.16 0.022,0.347 0.347,0 0,1 -0.292,-0.148c-0.078,-0.12 -0.073,-0.299 0.012,-0.504l0.04,-0.092c0.138,-0.308 0.368,-0.825 0.11,-1.317 -0.194,-0.37 -0.511,-0.602 -0.892,-0.65a1.145,1.145 0,0 0,-0.983 0.355c-0.379,0.418 -0.438,0.988 -0.364,1.19 0.027,0.073 0.069,0.094 0.099,0.098 0.065,0.009 0.16,-0.038 0.22,-0.2l0.017,-0.052c0.026,-0.085 0.076,-0.243 0.157,-0.37a0.688,0.688 0,0 1,0.953 -0.2c0.266,0.175 0.368,0.5 0.255,0.811 -0.059,0.161 -0.154,0.468 -0.133,0.72 0.043,0.512 0.357,0.717 0.638,0.74 0.274,0.01 0.466,-0.145 0.514,-0.258 0.03,-0.066 0.005,-0.107 -0.01,-0.125v0.001zM22.691,15.194c-0.01,-0.037 -0.078,-0.286 -0.172,-0.586l-0.19,-0.51c0.375,-0.563 0.381,-1.066 0.332,-1.35 -0.054,-0.353 -0.2,-0.654 -0.496,-0.964 -0.295,-0.312 -0.9,-0.63 -1.75,-0.868l-0.445,-0.124c-0.002,-0.018 -0.023,-1.053 -0.043,-1.497 -0.013,-0.32 -0.041,-0.822 -0.196,-1.315 -0.185,-0.669 -0.507,-1.253 -0.91,-1.627 1.11,-1.152 1.803,-2.422 1.801,-3.511 -0.003,-2.095 -2.571,-2.73 -5.736,-1.416l-0.67,0.285a666.1,666.1 0,0 0,-1.23 -1.207C9.376,-2.65 -1.905,9.912 1.701,12.964l0.789,0.668a3.885,3.885 0,0 0,-0.22 1.793c0.085,0.84 0.517,1.644 1.218,2.266 0.665,0.59 1.54,0.965 2.389,0.964 1.403,3.24 4.61,5.228 8.37,5.34 4.034,0.12 7.42,-1.776 8.84,-5.182 0.093,-0.24 0.486,-1.317 0.486,-2.267 0,-0.956 -0.539,-1.352 -0.882,-1.352zM6.188,17.744a1.94,1.94 0,0 1,-0.374 0.027c-1.218,-0.033 -2.534,-1.131 -2.665,-2.435 -0.145,-1.44 0.59,-2.548 1.89,-2.81a2.22,2.22 0,0 1,0.547 -0.04c0.729,0.04 1.803,0.6 2.048,2.191 0.217,1.408 -0.128,2.843 -1.446,3.068zM4.828,11.664c-0.81,0.157 -1.524,0.617 -1.96,1.252 -0.261,-0.218 -0.747,-0.64 -0.833,-0.804 -0.697,-1.325 0.76,-3.902 1.778,-5.357C6.33,3.159 10.268,0.437 12.093,0.931c0.296,0.084 1.278,1.224 1.278,1.224s-1.823,1.013 -3.514,2.426c-2.278,1.757 -3.999,4.311 -5.03,7.083zM17.615,17.206a0.072,0.072 0,0 0,0.042 -0.071,0.067 0.067,0 0,0 -0.074,-0.06s-1.908,0.283 -3.711,-0.379c0.196,-0.639 0.718,-0.408 1.508,-0.344a11.01,11.01 0,0 0,3.64 -0.394c0.816,-0.235 1.888,-0.698 2.722,-1.356 0.28,0.618 0.38,1.298 0.38,1.298s0.217,-0.039 0.399,0.073c0.171,0.106 0.297,0.326 0.211,0.895 -0.175,1.063 -0.626,1.926 -1.384,2.72a5.698,5.698 0,0 1,-1.663 1.244,7.018 7.018,0 0,1 -1.085,0.46c-2.858,0.935 -5.784,-0.093 -6.727,-2.3a3.582,3.582 0,0 1,-0.19 -0.522c-0.401,-1.455 -0.06,-3.2 1.007,-4.299 0.065,-0.07 0.132,-0.153 0.132,-0.256 0,-0.087 -0.055,-0.178 -0.102,-0.243 -0.373,-0.542 -1.666,-1.466 -1.406,-3.254 0.186,-1.285 1.308,-2.189 2.353,-2.135l0.265,0.015c0.453,0.027 0.848,0.085 1.222,0.101 0.624,0.027 1.185,-0.064 1.85,-0.619 0.224,-0.187 0.404,-0.35 0.708,-0.401 0.032,-0.005 0.111,-0.034 0.27,-0.026a0.892,0.892 0,0 1,0.456 0.146c0.533,0.355 0.608,1.215 0.636,1.845 0.016,0.36 0.059,1.228 0.074,1.478 0.034,0.57 0.183,0.65 0.486,0.75 0.17,0.057 0.329,0.099 0.562,0.164 0.705,0.199 1.123,0.4 1.387,0.659 0.158,0.161 0.23,0.333 0.253,0.497 0.084,0.608 -0.47,1.359 -1.938,2.041 -1.605,0.746 -3.55,0.935 -4.895,0.785l-0.471,-0.053c-1.076,-0.145 -1.689,1.247 -1.044,2.201 0.416,0.615 1.55,1.015 2.683,1.015 2.6,0 4.598,-1.111 5.341,-2.072l0.06,-0.085c0.036,-0.055 0.006,-0.085 -0.04,-0.054 -0.607,0.416 -3.304,2.069 -6.19,1.571 0,0 -0.35,-0.057 -0.67,-0.182 -0.254,-0.099 -0.786,-0.344 -0.85,-0.891 2.328,0.721 3.793,0.039 3.793,0.039zM13.927,16.77l0.001,0.001v-0.002zM9.473,6.74c0.895,-1.036 1.996,-1.936 2.982,-2.441 0.034,-0.017 0.07,0.02 0.052,0.053 -0.079,0.142 -0.23,0.447 -0.277,0.677a0.04,0.04 0,0 0,0.061 0.042c0.614,-0.419 1.681,-0.868 2.618,-0.925 0.04,-0.003 0.06,0.049 0.027,0.074 -0.154,0.119 -0.293,0.258 -0.411,0.413a0.04,0.04 0,0 0,0.031 0.064c0.657,0.005 1.584,0.235 2.188,0.575 0.04,0.023 0.012,0.102 -0.034,0.092 -0.914,-0.21 -2.41,-0.37 -3.964,0.01 -1.387,0.339 -2.446,0.862 -3.218,1.425 -0.04,0.029 -0.086,-0.023 -0.055,-0.06z"/>
+</vector>