diff --git a/src/client.cpp b/src/client.cpp
index a27d568d..986bb42d 100755
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -109,7 +109,9 @@ void CClient::OnNewConnection()
     // the server still thinks that we are connected (the server is still
     // waiting for the channel time-out). If we now connect again, we would
     // not get the list because the server does not know about a new connection.
+    // Same problem is with the jitter buffer message.
     Channel.CreateReqConnClientsList();
+    Channel.CreateJitBufMes ( Channel.GetSockBufNumFrames() );
 }
 
 void CClient::OnReceivePingMessage ( int iMs )
diff --git a/src/server.cpp b/src/server.cpp
index b5cfaaac..ea84c278 100755
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -716,6 +716,14 @@ bAudioOK = true;
             // in case the client thinks he is still connected but the server
             // was restartet, it is important that we send the channel list
             // at this place.
+
+
+// TODO this does not work somehow (another problem: the channel name
+// is not yet received from the new client)
+// possible solution: create (new) request channel name message, if this one
+// is received, the channel list for all clients are automatically sent
+// by the server
+
             CreateAndSendChanListForAllConChannels();
         }
     }