Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 10574)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 10575)
@@ -2203,5 +2203,5 @@
 		DHTMessage dhtmsg(dhtMsg->getKey(), vect);
 		omsg.encapsulate(&dhtmsg);
-		dhtSend(&omsg, omsg.getDestinationNode());
+		send(&omsg, omsg.getDestinationNode());
 		break;
 	}
@@ -2248,4 +2248,5 @@
 	OverlayMsg msg( OverlayMsg::typeDHTPut );
 	msg.encapsulate( &dhtmsg );
+	msg.setSourceNode(this->nodeId);
 	dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2261,4 +2262,5 @@
 	OverlayMsg msg(OverlayMsg::typeDHTRemove);
 	msg.encapsulate( &dhtmsg );
+	msg.setSourceNode(this->nodeId);
 	dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2274,4 +2276,5 @@
 	OverlayMsg msg(OverlayMsg::typeDHTRemove);
 	msg.encapsulate( &dhtmsg );
+	msg.setSourceNode(this->nodeId);
 	dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2289,4 +2292,5 @@
 	msg.setService(service);
 	msg.encapsulate( &dhtmsg );
+	msg.setSourceNode(this->nodeId);
 	dhtSend(&msg, dhtmsg.getHashedKey());
 }
@@ -2295,7 +2299,4 @@
 	// log: dht send
 	logging_info("DHT-Send: Sending message with key=" << dest.toString() );
-
-	/// set source and destination
-	msg->setSourceNode(this->nodeId);
 
 	// local storage? yes-> put into DHT directly