Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 5490)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 5493)
@@ -172,5 +172,5 @@
 			<< " using relay " << ld->localRelay
 		);
-
+/*
 		// get local relay link descriptor and mark as used for relaying
 		LinkDescriptor* rld = getRelayDescriptor(ld->localRelay);
@@ -180,5 +180,5 @@
 			return -1;
 		}
-		rld->markAsRelay();
+		rld->markAsRelay();*/
 
 		// create a information relay message to inform the relay about
@@ -190,5 +190,5 @@
 		// route message to relay node in order to inform it!
 		logging_debug("sendMessage: Sending message over relayed link with" << ld );
-		overlayInterface->routeMessage(rld->remoteNode, rld->overlayId, &overlay_msg);
+		sendOverlay( &overlay_msg, ld->localRelay );
 		return 0;
 	}
Index: /source/ariba/utility/transport/rfcomm/rfcomm.cpp
===================================================================
--- /source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 5490)
+++ /source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 5493)
@@ -378,6 +378,4 @@
 
 void rfcomm::start_write( link_info* info ) {
-	boost::mutex::scoped_lock(info->mutex);
-
 	// do not start writing if sending is in progress
 	if (info->sending || !info->up || info->send_buffer.size()==0) return;