diff --git a/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar b/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar
index 3a48edb41..83e026613 100644
Binary files a/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar and b/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar differ
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
index 8cde414d3..4e2ad6c2f 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
@@ -1040,9 +1040,7 @@ public void run()
                     responsePacket.setTo(fromID);
                     parentProvider.getConnection().sendPacket(responsePacket);
 
-                        }
-                    }
-                ).start();
+                }}).start();
             }
             else if (presenceType == Presence.Type.unsubscribed)
             {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
index 900e63190..e104d9d29 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
@@ -886,26 +886,29 @@ public void entriesAdded(Collection<String> addresses)
                 ContactJabberImpl contact =
                     findContactById(entry.getUser());
 
-                if(contact != null && contact.isPersistent())
+                if(contact != null)
                 {
-                    contact.setResolved(entry);
-                    continue;
-                }
-                else
-                {
-                    ContactGroup oldParentGroup =
-                        contact.getParentContactGroup();
-                    // if contact is in not in contact list
-                    // we must remove it from there in order to correctlly
-                    // process adding contact
-                    // this happens if we accept subscribe request
-                    // not from sip-communicator
-                    if(oldParentGroup instanceof ContactGroupJabberImpl
-                        && !oldParentGroup.isPersistent())
+                    if(contact.isPersistent())
+                    {
+                        contact.setResolved(entry);
+                        continue;
+                    }
+                    else
                     {
-                        ((ContactGroupJabberImpl)oldParentGroup)
-                            .removeContact(contact);
-                        fireContactRemoved(oldParentGroup, contact);
+                        ContactGroup oldParentGroup =
+                            contact.getParentContactGroup();
+                        // if contact is in not in contact list
+                        // we must remove it from there in order to correctlly
+                        // process adding contact
+                        // this happens if we accept subscribe request
+                        // not from sip-communicator
+                        if(oldParentGroup instanceof ContactGroupJabberImpl
+                            && !oldParentGroup.isPersistent())
+                        {
+                            ((ContactGroupJabberImpl)oldParentGroup)
+                                .removeContact(contact);
+                            fireContactRemoved(oldParentGroup, contact);
+                        }
                     }
                 }
                 contact = new ContactJabberImpl(roster.getEntry(id),