diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 7e3c17dfd..5f3f823e4 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriendImpl;
 import org.linphone.core.LinphoneFriendList;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.mediastream.Log;
@@ -295,13 +296,9 @@ public class ContactsManager extends ContentObserver {
 	}
 	
 	public synchronized void refreshSipContact(LinphoneFriend lf) {
-		for (LinphoneContact contact : contacts) {
-			if (contact.getLinphoneFriend() == lf) {
-				if (contact.isInLinphoneFriendList() && !sipContacts.contains(contact)) {
-					sipContacts.add(contact);
-				}
-				break;
-			}
+		LinphoneContact contact = ((LinphoneFriendImpl)lf).getLinphoneContact();
+		if (!sipContacts.contains(contact)) {
+			sipContacts.add(contact);
 		}
 		Collections.sort(sipContacts);
 		
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 52acafd84..17802bf82 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -28,6 +28,7 @@ import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriendImpl;
 import org.linphone.core.LinphoneFriend.SubscribePolicy;
 import org.linphone.core.PresenceBasicStatus;
 import org.linphone.core.PresenceModel;
@@ -415,6 +416,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			if (isAndroidContact()) {
 				friend.setRefKey(getAndroidId());
 			}
+			((LinphoneFriendImpl)friend).setLinphoneContact(this);
 			created = true;
 		}
 		if (isLinphoneFriend()) {
@@ -571,6 +573,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 
 	public void setFriend(LinphoneFriend f) {
 		friend = f;
+		((LinphoneFriendImpl)friend).setLinphoneContact(this);
 	}
 	
 	public void getAndroidIds() {
@@ -702,6 +705,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		friend.enableSubscribes(false);
 		friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);
 		contact.friend = friend;
+		((LinphoneFriendImpl)friend).setLinphoneContact(contact);
 		return contact;
 	}
 
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 7254fe94e..0e43266ed 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 7254fe94e7155f0164fca177f8bf54ab82b76e84
+Subproject commit 0e43266edc3360de55113c540444fb3fcbc44cf3
diff --git a/submodules/belle-sip b/submodules/belle-sip
index b1695fb52..13e7e7d93 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit b1695fb52ede996ed0b50167aab787d1373f49e4
+Subproject commit 13e7e7d933daeb697946816f5c81a355bf47c219
diff --git a/submodules/linphone b/submodules/linphone
index 2b407fabf..5500c7455 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2b407fabfae4db9029190444b3c59ffee39b1efd
+Subproject commit 5500c7455d75f083a8dd3bbaebd42fb13f40b626