diff --git a/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java b/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
index 83b08a84e4e7c1a892736e03c61bd1416a2b8113..1d4822467af3985f5ba33605b26daaad5fe74f3f 100644
--- a/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
+++ b/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
@@ -44,9 +44,11 @@ public class ClientMessenger implements IClientMessenger
 
     private int outgoingMessageIdx;
 
-    public ClientMessenger(String serviceConversationId, ISendingMessenger senderToService)
+    public ClientMessenger(ServiceConversationDTO serviceConversationDTO,
+            ISendingMessenger senderToService)
     {
-        this.serviceConversationId = serviceConversationId;
+        this.serviceConversationId = serviceConversationDTO.getServiceConversationId();
+        this.timeoutMillis = serviceConversationDTO.getClientTimeoutInMillis();
         this.senderToService = senderToService;
     }