Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 3712)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 3713)
@@ -320,5 +320,7 @@
 		if( i->second.autolink ){
 			logging_info( "auto link " << link.toString() << " is not up yet, queueing message" );
-			i->second.waitingmsg.push_back( new Message(*message) );
+			Data data = data_serialize( message );
+			const_cast<Message*>(message)->dropPayload();
+			i->second.waitingmsg.push_back( new Message(data) );
 		} else {
 			logging_error("link " << link.toString() << " is not up yet, dropping message" );
Index: /source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- /source/ariba/overlay/modules/chord/Chord.cpp	(revision 3712)
+++ /source/ariba/overlay/modules/chord/Chord.cpp	(revision 3713)
@@ -161,5 +161,4 @@
 			remote.toString() );
 	route_item* item = table->insert(remote);
-
 
 	// item added to routing table?