diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 1608b89632..e281dd487e 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -1709,11 +1709,11 @@ public class EntityRule {
             message.error = Log.formatThrowable(ex);
             db.message().setMessageError(message.id, message.error);
             return false;
+        } finally {
+            db.message().setMessageContent(message.id, message.content, message.language, message.plain_only, message.preview, message.warning);
+            db.message().setMessageNotifying(message.id, 0);
         }
 
-        db.message().setMessageContent(message.id, message.content, message.language, message.plain_only, message.preview, message.warning);
-        db.message().setMessageNotifying(message.id, 0);
-
         return true;
     }