diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 1722041c7e658c8d3c9a5616e84dd8a5594783af..f67a8b2c42fa031577d7f56697a5a4e79e35433f 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -849,6 +849,10 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                                 replacedMessage.clearPayloads();
                                 replacedMessage.setFileParams(null);
                                 replacedMessage.addPayload(replaceElement);
+                            } else {
+                                for (final var p : message.getPayloads()) {
+                                    replacedMessage.addPayload(p);
+                                }
                             }
                             if (replacedMessage.getServerMsgId() == null || message.getServerMsgId() != null) {
                                 replacedMessage.setServerMsgId(message.getServerMsgId());