diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IdentityManager.java b/src/net/java/sip/communicator/impl/protocol/irc/IdentityManager.java
index b3c5d3688..e03fb914c 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IdentityManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IdentityManager.java
@@ -37,8 +37,11 @@ public class IdentityManager
         .getLogger(IdentityManager.class);
 
     /**
-     * Reserved symbols. These symbols have special meaning and cannot be
-     * used to start nick names.
+     * Reserved symbols. These symbols have special meaning and cannot be used
+     * to start nick names.
+     *
+     * FIXME remove this reserved symbol list, after checkNick(...) was
+     * improved.
      */
     private static final Set<Character> RESERVED;
 
@@ -200,13 +203,14 @@ public static String checkNick(final String nick,
             throw new IllegalArgumentException(
                 "a nick name must be provided");
         }
-        // TODO Add '+' and '!' to reserved symbols too?
         if (RESERVED.contains(nick.charAt(0)))
         {
             throw new IllegalArgumentException(
                 "the nick name must not start with '#' or '&' "
                     + "since these are reserved for IRC's channels");
         }
+        // FIXME Improve nick verification corresponding to RFC1459, section
+        // 2.3.1
         if (isupportNickLen != null
             && nick.length() > isupportNickLen.intValue())
         {
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 23f106691..6e6cddbed 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
@@ -280,6 +280,9 @@ public void dispose()
      * Listener for debugging purposes. If logging level is set high enough,
      * this listener is added to the irc-api client so it can show all IRC
      * messages as they are handled.
+     * 
+     * FIXME delete listener in case of local user "QUIT :&lt;message&gt;"
+     * FIXME delete listener in case of "ERROR :&lt;message&gt;"
      *
      * @author Danny van Heumen
      */