diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
index 4f6eda705..9fa1d6694 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
@@ -16,6 +16,7 @@
 import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.main.*;
+import net.java.sip.communicator.impl.gui.main.message.*;
 import net.java.sip.communicator.impl.gui.main.message.history.HistoryWindow;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
@@ -129,6 +130,17 @@ public void metaContactRenamed(MetaContactRenamedEvent evt)
     public void protoContactAdded(ProtoContactEvent evt)
     {
         this.modifyContact(evt.getNewParent());
+        
+        Contact contact = evt.getProtoContact();
+        MetaContact metaContact = contactList.findMetaContactByContact(contact);
+        ContactListPanel clistPanel = mainFrame.getContactListPanel();
+        
+        if (clistPanel.isChatOpenedForContact(metaContact))
+        {
+            ChatPanel chatPanel = clistPanel.getContactChat(metaContact);
+            chatPanel.getChatSendPanel()
+                .getProtoContactSelectorBox().addContact(contact);
+        }
     }
 
     /**
@@ -136,8 +148,7 @@ public void protoContactAdded(ProtoContactEvent evt)
      * protocol contact has been removed.
      */
     public void protoContactRemoved(ProtoContactEvent evt)
-    {
-        System.out.println("REMOVE PROTO CONTACT");
+    {   
         this.modifyContact(evt.getOldParent());
     }