diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java
index f257c7bc6..652d0a96a 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ServerStoredContactListIcqImpl.java
@@ -632,7 +632,8 @@ public void moveContact(ContactIcqImpl contact,
                             ContactGroupIcqImpl newParent)
     {
         List contactsToMove = new ArrayList();
-        contactsToMove.add(contact);
+
+        contactsToMove.add(contact.getJoustSimBuddy());
 
         buddyList.moveBuddies(contactsToMove,
                               newParent.getJoustSimSourceGroup());
@@ -1222,6 +1223,8 @@ public void run()
                                 PROPERTY_DISPLAY_NAME, contact,
                                 oldNickname, nickName);
                         }
+                        else
+                            contact.setNickname(oldNickname);
                     }
                 }
             }