diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 0caa8bf1f6..a179d17d07 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -547,8 +547,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                             draft.content = true;
                             draft.received = new Date().getTime();
                             draft.seen = false;
-                            draft.ui_seen = false;
+                            draft.answered =false;
                             draft.flagged = false;
+                            draft.ui_seen = false;
+                            draft.ui_answered = false;
                             draft.ui_flagged = false;
                             draft.ui_hide = false;
                             draft.ui_found = false;
@@ -828,8 +830,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     draft.content = true;
                     draft.received = new Date().getTime();
                     draft.seen = false;
-                    draft.ui_seen = false;
+                    draft.answered = false;
                     draft.flagged = false;
+                    draft.ui_seen = false;
+                    draft.ui_answered = false;
                     draft.ui_flagged = false;
                     draft.ui_hide = false;
                     draft.ui_found = false;