diff --git a/app/src/main/java/eu/faircode/email/MimeMessageEx.java b/app/src/main/java/eu/faircode/email/MimeMessageEx.java
index 046567b8ba..d08840ea12 100644
--- a/app/src/main/java/eu/faircode/email/MimeMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/MimeMessageEx.java
@@ -58,6 +58,14 @@ public class MimeMessageEx extends MimeMessage {
         }
     }
 
+    @Override
+    public synchronized Flags getFlags() throws MessagingException {
+        if (original == null)
+            return super.getFlags();
+        else
+            return original.getFlags();
+    }
+
     @Override
     public synchronized boolean isSet(Flags.Flag flag) throws MessagingException {
         if (original == null)
@@ -65,4 +73,20 @@ public class MimeMessageEx extends MimeMessage {
         else
             return original.isSet(flag);
     }
+
+    @Override
+    public void setFlag(Flags.Flag flag, boolean set) throws MessagingException {
+        if (original == null)
+            super.setFlag(flag, set);
+        else
+            original.setFlag(flag, set);
+    }
+
+    @Override
+    public synchronized void setFlags(Flags flag, boolean set) throws MessagingException {
+        if (original == null)
+            super.setFlags(flag, set);
+        else
+            original.setFlags(flag, set);
+    }
 }