diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 328b94fe17..eb29dcfc1d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1257,7 +1257,23 @@ public class MessageHelper {
     }
 
     Address[] getReturnPath() throws MessagingException {
-        return getAddressHeader("Return-Path");
+        Address[] addresses = getAddressHeader("Return-Path");
+        if (addresses == null)
+            return null;
+
+        List<Address> result = new ArrayList<>();
+        for (int i = 0; i < addresses.length; i++) {
+            boolean duplicate = false;
+            for (int j = 0; j < i; j++)
+                if (addresses[i].equals(addresses[j])) {
+                    duplicate = true;
+                    break;
+                }
+            if (!duplicate)
+                result.add(addresses[i]);
+        }
+
+        return result.toArray(new Address[0]);
     }
 
     Address[] getSender() throws MessagingException {