diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index eaceeb9fe265d1a9cd295d9bd34b31d0fce1622b..cbb04f2b8c850d3f6baa270e6640d3b38290aeaf 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -783,7 +783,6 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                                 }
                                 replacedMessage.clearPayloads();
                                 replacedMessage.setFileParams(null);
-                                replacedMessage.setDeleted(true);
                                 replacedMessage.addPayload(replaceElement);
                             }
                             if (replacedMessage.getServerMsgId() == null || message.getServerMsgId() != null) {
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 4a1f9c39a464fa4dd5464c3b2a09ec84b23e3903..20a49cf94b75137fe2d5803077d00f8a7969d28e 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -532,6 +532,7 @@ public class FileBackend {
     public boolean deleteFile(Message message) {
         File file = getFile(message);
         if (file.delete()) {
+            message.setDeleted(true);
             updateMediaScanner(file);
             return true;
         } else {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index c88485141abc0f3160dc2599777849404bc99013..c834d9212721491fb53c652f7550e4fd5d9e5ffb 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1815,7 +1815,6 @@ public class ConversationFragment extends XmppFragment
                         File f = activity.xmppConnectionService.getFileBackend().getFile(selectedMessage);
                         activity.xmppConnectionService.blockMedia(f);
                         activity.xmppConnectionService.getFileBackend().deleteFile(selectedMessage);
-                        selectedMessage.setDeleted(true);
                         activity.xmppConnectionService.evictPreview(f);
                         activity.xmppConnectionService.updateMessage(selectedMessage, false);
                         activity.onConversationsListItemUpdated();
@@ -2679,7 +2678,6 @@ public class ConversationFragment extends XmppFragment
                         }
                     }
                     if (activity.xmppConnectionService.getFileBackend().deleteFile(message)) {
-                        message.setDeleted(true);
                         activity.xmppConnectionService.evictPreview(activity.xmppConnectionService.getFileBackend().getFile(message));
                         activity.xmppConnectionService.updateMessage(message, false);
                         activity.onConversationsListItemUpdated();