diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java
index f54ae92ac..8006b67ab 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ContactGroupIcqImpl.java
@@ -153,22 +153,16 @@ void addContact(ContactIcqImpl contact)
      */
     void removeContact(ContactIcqImpl contact)
     {
-        for (Iterator<Map.Entry<String, Contact>> buddyIter
-                = buddies.entrySet().iterator();
-             buddyIter.hasNext();)
-        {
-            if (buddyIter.next().getValue().equals(contact))
-            {
-                buddyIter.remove();
-                break;
-            }
-        }
+        if (contact == null )
+            return;
+
+        buddies.remove(contact.getUIN().toLowerCase());
     }
 
     /**
      * Returns an Iterator over all contacts, member of this
      * <tt>ContactGroup</tt>.
-     * 
+     *
      * @return a java.util.Iterator over all contacts inside this
      *         <tt>ContactGroup</tt>. In case the group doesn't contain any
      *         members it will return an empty iterator.