diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
index 86e9427d7..5bd7903d5 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
@@ -293,7 +293,7 @@ public List<String> getServerChatRoomList()
         {
             if (this.channellist.instance == null)
             {
-                List<String> list = new ArrayList<String>();
+                List<String> list = new LinkedList<String>();
                 synchronized (list)
                 {
                     try
@@ -460,6 +460,7 @@ public void onFailure(Exception e)
                     });
                 // Wait until async channel join operation has finished.
                 joinSignal.wait();
+                // TODO How to handle 471: Channel is full (reached set user limit)?
                 if (isJoined(chatroom))
                 {
                     // In case waiting ends with successful join