Index: AXimpl/Converter.cls.xml
===================================================================
diff -u -r42131 -r43016
--- AXimpl/Converter.cls.xml	(.../Converter.cls.xml)	(revision 42131)
+++ AXimpl/Converter.cls.xml	(.../Converter.cls.xml)	(revision 43016)
@@ -2,6 +2,12 @@
 <Export generator="Cache" version="24">
 <Class name="AXimpl.Converter">
 <Abstract>1</Abstract>
+
+<Method name="Convert">
+<Abstract>1</Abstract>
+<FormalSpec>Request:%CacheString,MessageId:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
 </Class>
 
 
Index: AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r42703 -r43016
--- AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42703)
+++ AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 43016)
@@ -37,10 +37,14 @@
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
 	#dim Envelope As %CacheString = $classmethod(..ConfigOut.GetRequestEnvelope(Request),"%New")
-	set Envelope.Header.MessageId = ..MessageManager.GenerateID()
+	
+	#dim MessageId As %String = ..MessageManager.GenerateID()
+	
+	set Envelope.Header.MessageId = MessageId
 	set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
 	set Envelope.Header.Action = ..ConfigOut.GetAction(Request)
-	set Envelope.Body.MessageParts = ..ConfigOut.GetConverter(Request).Convert(Request)
+	set Envelope.Body.MessageParts = ..ConfigOut.GetConverter(Request).Convert(Request,MessageId)
+	
 	quit Envelope
 ]]></Implementation>
 </Method>