diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 930fdf0f01..90b0851b1e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -449,7 +449,10 @@ public class MessageHelper {
     }
 
     String getDeliveredTo() throws MessagingException {
-        return imessage.getHeader("Delivered-To", imessage.getHeader("X-Delivered-To", null));
+        String header = imessage.getHeader("Delivered-To", null);
+        if (header == null)
+            header = imessage.getHeader("X-Delivered-To", null);
+        return header;
     }
 
     String getInReplyTo() throws MessagingException {