diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index ebe133e5b0..6a0ee9d1b8 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2010,6 +2010,10 @@ public class MessageHelper {
if (!TextUtils.isEmpty(icontact))
return "icontact";
+ String paypal = imessage.getHeader("X-Email-Type-Id", null);
+ if (!TextUtils.isEmpty(paypal))
+ return "paypal";
+
String xmailer = imessage.getHeader("X-Mailer", null);
if (!TextUtils.isEmpty(xmailer)) {
if (xmailer.contains("iPhone Mail"))
diff --git a/app/src/main/res/drawable/infra_paypal.xml b/app/src/main/res/drawable/infra_paypal.xml
new file mode 100644
index 0000000000..e45357a71b
--- /dev/null
+++ b/app/src/main/res/drawable/infra_paypal.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index df2555c744..1b7d2d68f1 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -931,7 +931,7 @@
app:constraint_referenced_ids="
infra_awsses,infra_elastic,infra_gmail,infra_icloud,infra_icontact,
infra_mailchimp,infra_mailgun,infra_mailjet,infra_mandrill,
- infra_netcore,infra_outlook,infra_phpmailer,infra_postmark,
+ infra_netcore,infra_outlook,infra_phpmailer,infra_paypal,infra_postmark,
infra_salesforce,infra_sendgrid,infra_sendinblue,infra_sparkpost,
infra_yahoo,infra_zeptomail,infra_zoho"
app:flow_horizontalBias="0"
@@ -1042,6 +1042,15 @@
app:srcCompat="@drawable/infra_outlook"
tools:ignore="MissingConstraints" />
+
+
Mandrill
Pepipost/netcore
Outlook/Office 365
+ PayPal
PHPMailer
Postmark
Salesforce