diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 64e3d31564..1c4a60931e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1688,6 +1688,10 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(postmark))
             return "postmark";
 
+        String salesforce = imessage.getHeader("X-SFDC-User", null);
+        if (!TextUtils.isEmpty(salesforce))
+            return "salesforce";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_salesforce.xml b/app/src/main/res/drawable/infra_salesforce.xml
new file mode 100644
index 0000000000..d53b8280ee
--- /dev/null
+++ b/app/src/main/res/drawable/infra_salesforce.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="273dp"
+    android:height="191dp"
+    android:viewportWidth="273"
+    android:viewportHeight="191">
+  <group>
+    <clip-path
+        android:pathData="m0.06,0.5h272v190h-272z"/>
+    <path
+        android:pathData="m113,21.3c8.78,-9.14 21,-14.8 34.5,-14.8 18,0 33.6,10 42,24.9a58,58 0,0 1,23.7 -5.05c32.4,0 58.7,26.5 58.7,59.2s-26.3,59.2 -58.7,59.2c-3.96,0 -7.82,-0.398 -11.6,-1.15 -7.35,13.1 -21.4,22 -37.4,22a42.7,42.7 0,0 1,-18.8 -4.32c-7.45,17.5 -24.8,29.8 -45,29.8 -21.1,0 -39,-13.3 -45.9,-32a45.1,45.1 0,0 1,-9.34 0.972c-25.1,0 -45.4,-20.6 -45.4,-45.9 0,-17 9.14,-31.8 22.7,-39.8a52.6,52.6 0,0 1,-4.35 -21c0,-29.2 23.7,-52.8 52.9,-52.8 17.1,0 32.4,8.15 42,20.8"
+        android:fillColor="#00A1E0"
+        android:fillType="evenOdd"/>
+  </group>
+  <path
+      android:pathData="m39.4,99.3c-0.171,0.446 0.061,0.539 0.116,0.618 0.511,0.37 1.03,0.638 1.55,0.939 2.78,1.47 5.4,1.9 8.14,1.9 5.58,0 9.05,-2.97 9.05,-7.75v-0.094c0,-4.42 -3.92,-6.03 -7.58,-7.18l-0.479,-0.155c-2.77,-0.898 -5.16,-1.68 -5.16,-3.5v-0.093c0,-1.56 1.4,-2.71 3.56,-2.71 2.4,0 5.26,0.799 7.09,1.81 0,0 0.542,0.35 0.739,-0.173 0.107,-0.283 1.04,-2.78 1.14,-3.06 0.106,-0.293 -0.08,-0.514 -0.271,-0.628 -2.1,-1.28 -5,-2.15 -8,-2.15l-0.557,0.002c-5.11,0 -8.68,3.09 -8.68,7.51v0.095c0,4.66 3.94,6.18 7.62,7.23l0.592,0.184c2.68,0.824 5,1.54 5,3.42v0.094c0,1.73 -1.51,3.02 -3.93,3.02 -0.941,0 -3.94,-0.016 -7.19,-2.07 -0.393,-0.229 -0.617,-0.394 -0.92,-0.579 -0.16,-0.097 -0.56,-0.272 -0.734,0.252l-1.1,3.06m81.7,0c-0.171,0.446 0.061,0.539 0.118,0.618 0.509,0.37 1.03,0.638 1.55,0.939 2.78,1.47 5.4,1.9 8.14,1.9 5.58,0 9.05,-2.97 9.05,-7.75v-0.094c0,-4.42 -3.91,-6.03 -7.58,-7.18l-0.479,-0.155c-2.77,-0.898 -5.16,-1.68 -5.16,-3.5v-0.093c0,-1.56 1.4,-2.71 3.56,-2.71 2.4,0 5.25,0.799 7.09,1.81 0,0 0.542,0.35 0.74,-0.173 0.106,-0.283 1.04,-2.78 1.13,-3.06 0.107,-0.293 -0.08,-0.514 -0.27,-0.628 -2.1,-1.28 -5,-2.15 -8,-2.15l-0.558,0.002c-5.11,0 -8.68,3.09 -8.68,7.51v0.095c0,4.66 3.94,6.18 7.62,7.23l0.591,0.184c2.69,0.824 5,1.54 5,3.42v0.094c0,1.73 -1.51,3.02 -3.93,3.02 -0.943,0 -3.95,-0.016 -7.19,-2.07 -0.393,-0.229 -0.623,-0.387 -0.921,-0.579 -0.101,-0.064 -0.572,-0.248 -0.733,0.252l-1.1,3.06m55.8,-9.36c0,2.7 -0.504,4.83 -1.49,6.34 -0.984,1.49 -2.47,2.22 -4.54,2.22s-3.55,-0.724 -4.52,-2.21c-0.977,-1.5 -1.47,-3.64 -1.47,-6.34 0,-2.7 0.496,-4.82 1.47,-6.31 0.968,-1.48 2.44,-2.19 4.52,-2.19s3.56,0.717 4.54,2.19c0.992,1.49 1.49,3.61 1.49,6.31m4.66,-5.01c-0.459,-1.55 -1.17,-2.91 -2.12,-4.05 -0.951,-1.14 -2.15,-2.06 -3.58,-2.72 -1.42,-0.665 -3.1,-1 -5,-1s-3.57,0.337 -5,1c-1.42,0.664 -2.63,1.58 -3.58,2.72 -0.948,1.14 -1.66,2.5 -2.12,4.05 -0.455,1.54 -0.686,3.22 -0.686,5.01 0,1.79 0.231,3.47 0.686,5.01 0.457,1.55 1.17,2.91 2.12,4.05 0.951,1.14 2.16,2.05 3.58,2.7 1.43,0.648 3.11,0.978 5,0.978 1.89,0 3.57,-0.33 4.99,-0.978 1.42,-0.648 2.63,-1.56 3.58,-2.7 0.949,-1.14 1.66,-2.5 2.12,-4.05 0.454,-1.54 0.685,-3.22 0.685,-5.01 0,-1.78 -0.231,-3.47 -0.685,-5.01m38.3,12.8c-0.153,-0.453 -0.595,-0.282 -0.595,-0.282 -0.677,0.259 -1.4,0.499 -2.17,0.619 -0.776,0.122 -1.64,0.183 -2.55,0.183 -2.25,0 -4.05,-0.671 -5.33,-2 -1.29,-1.33 -2.01,-3.47 -2,-6.37 0.007,-2.64 0.645,-4.62 1.79,-6.14 1.13,-1.5 2.87,-2.28 5.17,-2.28 1.92,0 3.39,0.223 4.93,0.705 0,0 0.365,0.159 0.54,-0.322 0.409,-1.13 0.711,-1.94 1.15,-3.18 0.124,-0.355 -0.18,-0.505 -0.291,-0.548 -0.604,-0.236 -2.03,-0.623 -3.11,-0.786 -1.01,-0.154 -2.18,-0.234 -3.5,-0.234 -1.96,0 -3.7,0.335 -5.19,0.999 -1.49,0.663 -2.75,1.58 -3.75,2.72 -1,1.14 -1.76,2.5 -2.27,4.05 -0.505,1.54 -0.76,3.23 -0.76,5.02 0,3.86 1.04,6.99 3.1,9.28 2.06,2.3 5.16,3.46 9.2,3.46 2.39,0 4.84,-0.483 6.6,-1.18 0,0 0.336,-0.162 0.19,-0.554l-1.15,-3.16m8.15,-10.4c0.223,-1.5 0.634,-2.75 1.28,-3.72 0.967,-1.48 2.44,-2.29 4.51,-2.29 2.07,0 3.44,0.814 4.42,2.29 0.65,0.975 0.934,2.27 1.04,3.72l-11.3,-0.002zM243.688,84.024c-0.397,-1.49 -1.38,-3 -2.02,-3.69 -1.02,-1.09 -2.01,-1.86 -3,-2.28a11.5,11.5 0,0 0,-4.52 -0.917c-1.97,0 -3.76,0.333 -5.21,1.01 -1.45,0.682 -2.67,1.61 -3.63,2.77 -0.959,1.16 -1.68,2.53 -2.14,4.1 -0.46,1.55 -0.692,3.25 -0.692,5.03 0,1.82 0.241,3.51 0.715,5.04 0.479,1.54 1.25,2.89 2.29,4.01 1.04,1.13 2.37,2.01 3.97,2.63 1.59,0.615 3.52,0.934 5.73,0.927 4.56,-0.015 6.96,-1.03 7.94,-1.58 0.175,-0.098 0.34,-0.267 0.134,-0.754l-1.03,-2.89c-0.158,-0.431 -0.594,-0.275 -0.594,-0.275 -1.13,0.422 -2.73,1.18 -6.48,1.17 -2.45,-0.004 -4.26,-0.727 -5.4,-1.86 -1.16,-1.16 -1.74,-2.85 -1.83,-5.25l15.8,0.012s0.416,-0.004 0.459,-0.41c0.017,-0.168 0.541,-3.24 -0.471,-6.79zM101.688,87.324c0.223,-1.5 0.635,-2.75 1.28,-3.72 0.968,-1.48 2.44,-2.29 4.51,-2.29 2.07,0 3.44,0.814 4.42,2.29 0.649,0.975 0.933,2.27 1.04,3.72l-11.3,-0.002zM117.388,84.024c-0.396,-1.49 -1.38,-3 -2.02,-3.69 -1.02,-1.09 -2.01,-1.86 -3,-2.28a11.5,11.5 0,0 0,-4.52 -0.917c-1.97,0 -3.76,0.333 -5.21,1.01 -1.45,0.682 -2.67,1.61 -3.63,2.77 -0.957,1.16 -1.68,2.53 -2.14,4.1 -0.459,1.55 -0.69,3.25 -0.69,5.03 0,1.82 0.239,3.51 0.716,5.04 0.478,1.54 1.25,2.89 2.28,4.01 1.04,1.13 2.37,2.01 3.97,2.63 1.59,0.615 3.51,0.934 5.73,0.927 4.56,-0.015 6.96,-1.03 7.94,-1.58 0.174,-0.098 0.34,-0.267 0.133,-0.754l-1.03,-2.89c-0.159,-0.431 -0.595,-0.275 -0.595,-0.275 -1.13,0.422 -2.73,1.18 -6.48,1.17 -2.44,-0.004 -4.26,-0.727 -5.4,-1.86 -1.16,-1.16 -1.74,-2.85 -1.83,-5.25l15.8,0.012s0.416,-0.004 0.459,-0.41c0.017,-0.168 0.541,-3.24 -0.472,-6.79zM67.588,97.624c-0.619,-0.494 -0.705,-0.615 -0.91,-0.936 -0.313,-0.483 -0.473,-1.17 -0.473,-2.05 0,-1.38 0.46,-2.38 1.41,-3.05 -0.01,0.002 1.36,-1.18 4.58,-1.14a32,32 0,0 1,4.28 0.365v7.17h0.002s-2,0.431 -4.26,0.567c-3.21,0.193 -4.63,-0.924 -4.62,-0.921zM73.868,86.524c-0.64,-0.047 -1.47,-0.07 -2.46,-0.07 -1.35,0 -2.66,0.168 -3.88,0.498 -1.23,0.332 -2.34,0.846 -3.29,1.53a7.63,7.63 0,0 0,-2.29 2.6c-0.559,1.04 -0.844,2.26 -0.844,3.64 0,1.4 0.243,2.61 0.723,3.6a6.54,6.54 0,0 0,2.06 2.47c0.877,0.638 1.96,1.11 3.21,1.39 1.24,0.283 2.64,0.426 4.18,0.426 1.62,0 3.23,-0.136 4.79,-0.399a95.1,95.1 0,0 0,3.97 -0.772c0.526,-0.121 1.11,-0.28 1.11,-0.28 0.39,-0.099 0.36,-0.516 0.36,-0.516l-0.009,-14.4c0,-3.16 -0.844,-5.51 -2.51,-6.96 -1.66,-1.45 -4.09,-2.18 -7.24,-2.18 -1.18,0 -3.09,0.16 -4.23,0.389 0,0 -3.44,0.668 -4.86,1.78 0,0 -0.312,0.192 -0.142,0.627l1.12,3c0.139,0.389 0.518,0.256 0.518,0.256s0.119,-0.047 0.259,-0.13c3.03,-1.65 6.87,-1.6 6.87,-1.6 1.7,0 3.02,0.345 3.9,1.02 0.861,0.661 1.3,1.66 1.3,3.76v0.667c-1.35,-0.196 -2.6,-0.309 -2.6,-0.309zM200.868,78.394a0.428,0.428 0,0 0,-0.237 -0.568c-0.269,-0.102 -1.61,-0.385 -2.64,-0.449 -1.98,-0.124 -3.08,0.21 -4.07,0.654 -0.978,0.441 -2.06,1.15 -2.66,1.97l-0.002,-1.92c0,-0.264 -0.187,-0.477 -0.453,-0.477h-4.04c-0.262,0 -0.452,0.213 -0.452,0.477v23.5a0.48,0.48 0,0 0,0.479 0.479h4.14a0.479,0.479 0,0 0,0.478 -0.479v-11.8c0,-1.58 0.174,-3.15 0.521,-4.14 0.342,-0.979 0.807,-1.76 1.38,-2.32a4.79,4.79 0,0 1,1.95 -1.17,7.68 7.68,0 0,1 2.12,-0.298c0.825,0 1.73,0.212 1.73,0.212 0.304,0.034 0.473,-0.152 0.576,-0.426 0.271,-0.721 1.04,-2.88 1.19,-3.31"
+      android:fillColor="#FFFFFE"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M162.201,67.548a13.258,13.258 0,0 0,-1.559 -0.37,12.217 12.217,0 0,0 -2.144,-0.166c-2.853,0 -5.102,0.806 -6.681,2.398 -1.568,1.58 -2.635,3.987 -3.17,7.154l-0.193,1.069h-3.581s-0.437,-0.018 -0.529,0.459l-0.588,3.28c-0.041,0.314 0.094,0.51 0.514,0.508h3.486l-3.537,19.743c-0.277,1.59 -0.594,2.898 -0.945,3.889 -0.346,0.978 -0.684,1.711 -1.1,2.243 -0.403,0.515 -0.785,0.894 -1.444,1.115 -0.544,0.183 -1.17,0.267 -1.856,0.267 -0.382,0 -0.89,-0.064 -1.265,-0.139 -0.375,-0.074 -0.57,-0.158 -0.851,-0.276 0,0 -0.409,-0.156 -0.57,0.254 -0.131,0.335 -1.06,2.89 -1.17,3.206 -0.112,0.312 0.045,0.558 0.243,0.629 0.464,0.166 0.809,0.272 1.441,0.421 0.878,0.207 1.618,0.22 2.311,0.22 1.452,0 2.775,-0.204 3.872,-0.6 1.104,-0.399 2.065,-1.094 2.915,-2.035 0.919,-1.015 1.497,-2.078 2.05,-3.528 0.547,-1.437 1.013,-3.221 1.386,-5.3l3.554,-20.109h5.196s0.438,0.016 0.529,-0.459l0.588,-3.28c0.041,-0.314 -0.093,-0.51 -0.515,-0.508h-5.043c0.025,-0.114 0.254,-1.888 0.833,-3.558 0.247,-0.713 0.712,-1.288 1.106,-1.683a3.273,3.273 0,0 1,1.321 -0.822,5.48 5.48,0 0,1 1.693,-0.244c0.475,0 0.941,0.057 1.296,0.131 0.489,0.104 0.679,0.159 0.807,0.197 0.514,0.157 0.583,0.005 0.684,-0.244l1.206,-3.312c0.124,-0.356 -0.178,-0.506 -0.29,-0.55m-70.474,34.117c0,0.264 -0.188,0.479 -0.452,0.479h-4.183c-0.265,0 -0.453,-0.215 -0.453,-0.479V67.997c0,-0.263 0.188,-0.476 0.453,-0.476h4.183c0.264,0 0.452,0.213 0.452,0.476v33.668"
+      android:fillColor="#FFFFFE"
+      android:fillType="evenOdd"/>
+</vector>