Index: trunk/BNC/src/bncgetthread.cpp
===================================================================
--- trunk/BNC/src/bncgetthread.cpp	(revision 9850)
+++ trunk/BNC/src/bncgetthread.cpp	(revision 9851)
@@ -474,5 +474,5 @@
 
         if (data.isEmpty() || BNC_CORE->sigintReceived) {
-          cout << "no more data or Ctrl-C received" << endl;
+          emit(newMessage("No more data or Ctrl-C received", true));
           BNC_CORE->stopCombination();
           BNC_CORE->stopPPP();
Index: trunk/BNC/src/upload/bncuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncuploadcaster.cpp	(revision 9850)
+++ trunk/BNC/src/upload/bncuploadcaster.cpp	(revision 9851)
@@ -266,5 +266,6 @@
       if (ans.indexOf("200") == -1) {
         int l = ans.indexOf("\r\n", 0);
-        emit(newMessage("Proxy: Connection broken for " + _mountpoint.toLatin1() + ": "  + ans.left(l), true));
+        emit(newMessage("Proxy: Connection broken for " + _mountpoint.toLatin1() + "@" +
+            _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()  + ": "  + ans.left(l), true));
         delete _outSocket; _outSocket = 0;
         return;
@@ -275,5 +276,5 @@
         _outSocket->startClientEncryption();
         if (!_outSocket->waitForEncrypted(timeOut)) {
-          emit(newMessage("Proxy/Caster: Encrypt timeout for " + _mountpoint.toLatin1() + " ("
+          emit(newMessage("Proxy/Caster: Encrypt timeout for " + _mountpoint.toLatin1() + "@"
                           + _casterOutHost.toLatin1() + ":"
                           + QString("%1) ").arg(_casterOutPort).toLatin1()
@@ -282,5 +283,6 @@
           return;
         } else {
-          emit(newMessage("Proxy: SSL handshake completed for " + _mountpoint.toLatin1(), true));
+          emit(newMessage("Proxy: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
+              _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1(), true));
         }
       }
@@ -308,9 +310,10 @@
     delete _outSocket; _outSocket = 0;
     int l = ans.indexOf("\r\n", 0);
-    emit(newMessage("Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
-                    ": Connection broken for " + _mountpoint.toLatin1() + ": " + ans.left(l), true));
-  } else {
-    emit(newMessage("Broadcaster" +   _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
-                    ": Connection opened for " + _mountpoint.toLatin1(), true));
+    emit(newMessage("Broadcaster:  Connection broken for " + _mountpoint.toLatin1() + "@" +
+         _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
+         ": " + ans.left(l), true));
+  } else {
+    emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toLatin1() + "@" +
+        _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() , true));
     _sOpenTrial = 0;
   }
@@ -325,6 +328,5 @@
     if (!_outSocket->waitForEncrypted(timeOut)) {
       emit(newMessage(
-           "Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
-           ": Connect timeout for " + _mountpoint.toLatin1() + " ("
+           "Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
               + outHost.toLatin1() + ":"
               + QString("%1) ").arg(outPort).toLatin1()
@@ -333,12 +335,11 @@
       return false;
     } else {
-      emit(newMessage("Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
-                      ": SSL handshake completed for " + _mountpoint.toLatin1(), true));
+      emit(newMessage("Broadcaster: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
+          _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1(), true));
     }
   } else {
     _outSocket->connectToHost(outHost, outPort);
     if (!_outSocket->waitForConnected(timeOut)) {
-      emit(newMessage("Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
-                      ": Connect timeout for " + _mountpoint.toLatin1() + " ("
+      emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
               + outHost.toLatin1() + ":"
               + QString("%1) ").arg(outPort).toLatin1()