diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index a53508b709..6822a075c8 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1704,6 +1704,10 @@ public class MessageHelper {
         if (!TextUtils.isEmpty(sparkpost))
             return "sparkpost";
 
+        String netcore = imessage.getHeader("X-FNCID", null);
+        if (!TextUtils.isEmpty(netcore))
+            return "netcore";
+
         return null;
     }
 
diff --git a/app/src/main/res/drawable/infra_netcore.xml b/app/src/main/res/drawable/infra_netcore.xml
new file mode 100644
index 0000000000..e0fc8bb226
--- /dev/null
+++ b/app/src/main/res/drawable/infra_netcore.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M18.9278,6.9605C17.0865,6.9605 15.4749,7.8908 14.8505,9.2392L14.7339,9.4924C14.3095,10.548 14.5984,11.5393 14.8684,12.0628C15.5462,13.3779 17.1031,14.3061 18.9278,14.3061C20.7525,14.3061 23.3334,12.0628 23.3334,10.6333C23.3334,8.605 21.3611,6.9605 18.9278,6.9605Z"
+      android:fillColor="#FFAD9F"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M12.6606,8.0023C12.134,9.3119 12.4925,10.5417 12.8276,11.1911C13.6687,12.8226 15.6009,13.974 17.8655,13.974C20.8848,13.974 23.3331,11.9338 23.3331,9.4177C23.3331,6.9015 20.8854,4.8613 17.8655,4.8613C15.5803,4.8613 13.5802,6.0155 12.8053,7.6883C11.9998,9.4265 12.1952,9.7039 11.1854,11.1828C10.4156,12.31 9.0026,13.974 6.1342,13.9916C3.1149,13.9916 0.6666,11.9519 0.6666,9.4353C0.6666,6.9187 3.1149,4.8785 6.1342,4.8785C8.0588,4.8785 9.7515,5.7075 10.7257,6.9601"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#143F93"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b98210f8a..4c868a2048 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1811,6 +1811,7 @@
     <string name="infra_mailgun" translatable="false">Mailgun</string>
     <string name="infra_mailjet" translatable="false">Mailjet</string>
     <string name="infra_mandrill" translatable="false">Mandrill</string>
+    <string name="infra_netcore" translatable="false">Pepipost/netcore</string>
     <string name="infra_postmark" translatable="false">Postmark</string>
     <string name="infra_salesforce" translatable="false">Salesforce</string>
     <string name="infra_sendgrid" translatable="false">SendGrid</string>