diff --git a/spectrum_manager/src/main.cpp b/spectrum_manager/src/main.cpp
index 48929919dac19835b7dc84d36b38b1c8648f35e6..31204ea16b3b57f8fb6c4d4dd47bcf7329c225b1 100644
--- a/spectrum_manager/src/main.cpp
+++ b/spectrum_manager/src/main.cpp
@@ -29,7 +29,9 @@ static void handleConnected(Swift::Client *client) {
 }
 
 static void handleMessageReceived(Swift::Client *client, Swift::Message::ref message) {
-	std::cout << "[      OK      ] " << client->getJID().getDomain() << ": " << message->getBody() <<  "\n";
+	std::string body = message->getBody();
+	boost::replace_all(body, "\n", "\n[      OK      ] " + client->getJID().getDomain() + ": ");
+	std::cout << "[      OK      ] " << client->getJID().getDomain() << ": " << body <<  "\n";
 	if (--finished == 0) {
 		exit(0);
 	}