diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 346756a905..28e075e721 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1967,7 +1967,8 @@ class Core {
                 Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid + " seen=" + seen);
             }
 
-            if ((!message.answered.equals(answered) || !message.ui_answered.equals(message.answered))) {
+            if ((!message.answered.equals(answered) || !message.ui_answered.equals(message.answered)) &&
+                    db.operation().getOperationCount(folder.id, message.id, EntityOperation.ANSWERED) == 0) {
                 update = true;
                 message.answered = answered;
                 message.ui_answered = answered;