diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index beeb2f39e..37cf7ed33 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -837,13 +837,13 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
                     if (Namespace.JINGLE_MESSAGE.equals(child.getNamespace()) && JINGLE_MESSAGE_ELEMENT_NAMES.contains(child.getName())) {
                         final String action = child.getName();
                         if (query == null) {
-                            if (!account.getJid().asBareJid().equals(from.asBareJid())) {
-                                processMessageReceipts(account, packet, query);
-                            }
                             if (serverMsgId == null) {
                                 serverMsgId = extractStanzaId(account, packet);
                             }
                             mXmppConnectionService.getJingleConnectionManager().deliverMessage(account, packet.getTo(), packet.getFrom(), child, remoteMsgId, serverMsgId, timestamp);
+                            if (!account.getJid().asBareJid().equals(from.asBareJid())) {
+                                processMessageReceipts(account, packet, query);
+                            }
                         } else if (query.isCatchup()) {
                             final String sessionId = child.getAttribute("id");
                             if (sessionId == null) {