diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index b8506e0586..b03d28650d 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2377,6 +2377,15 @@ class Core {
                         message.ui_ignored = false;
                         message.ui_browsed = false;
 
+                        if (message.deliveredto != null)
+                            try {
+                                Address deliveredto = new InternetAddress(message.deliveredto);
+                                if (MessageHelper.equalEmail(new Address[]{deliveredto}, message.to))
+                                    message.deliveredto = null;
+                            } catch (AddressException ex) {
+                                Log.w(ex);
+                            }
+
                         if (MessageHelper.equalEmail(message.submitter, message.from))
                             message.submitter = null;
 
@@ -3210,6 +3219,15 @@ class Core {
             if (message.flagged)
                 message.color = color;
 
+            if (message.deliveredto != null)
+                try {
+                    Address deliveredto = new InternetAddress(message.deliveredto);
+                    if (MessageHelper.equalEmail(new Address[]{deliveredto}, message.to))
+                        message.deliveredto = null;
+                } catch (AddressException ex) {
+                    Log.w(ex);
+                }
+
             if (MessageHelper.equalEmail(message.submitter, message.from))
                 message.submitter = null;