2 files changed, 3 insertions, 3 deletions
diff --git a/xmpp-vala/src/module/xep/0184_message_delivery_receipts.vala b/xmpp-vala/src/module/xep/0184_message_delivery_receipts.vala
index 7f4f8a03..cee09f22 100644
--- a/xmpp-vala/src/module/xep/0184_message_delivery_receipts.vala
+++ b/xmpp-vala/src/module/xep/0184_message_delivery_receipts.vala
@@ -4,7 +4,7 @@ namespace Xmpp.Xep.MessageDeliveryReceipts {
     public class Module : XmppStreamModule {
         public static ModuleIdentity<Module> IDENTITY = new ModuleIdentity<Module>(NS_URI, "0184_message_delivery_receipts");
 
-        public signal void receipt_received(XmppStream stream, Jid jid, string id);
+        public signal void receipt_received(XmppStream stream, Jid jid, string id, MessageStanza stanza);
 
         private SendPipelineListener send_pipeline_listener = new SendPipelineListener();
 
@@ -37,7 +37,7 @@ namespace Xmpp.Xep.MessageDeliveryReceipts {
         private void received_message(XmppStream stream, MessageStanza message) {
             StanzaNode? received_node = message.stanza.get_subnode("received", NS_URI);
             if (received_node != null) {
-                receipt_received(stream, message.from, received_node.get_attribute("id", NS_URI));
+                receipt_received(stream, message.from, received_node.get_attribute("id", NS_URI), message);
             }
         }
     }
diff --git a/xmpp-vala/src/module/xep/0198_stream_management.vala b/xmpp-vala/src/module/xep/0198_stream_management.vala
index b9185808..e053f3fb 100644
--- a/xmpp-vala/src/module/xep/0198_stream_management.vala
+++ b/xmpp-vala/src/module/xep/0198_stream_management.vala
@@ -179,11 +179,11 @@ public class Module : XmppStreamNegotiationModule, WriteNodeFunc {
         var remove_nrs = new ArrayList<int>();
         foreach (int nr in in_flight_stanzas.keys) {
             if (nr <= h) {
-                in_flight_stanzas[nr].promise.set_value(null);
                 remove_nrs.add(nr);
             }
         }
         foreach (int nr in remove_nrs) {
+            in_flight_stanzas[nr].promise.set_value(null);
             in_flight_stanzas.unset(nr);
         }
     }