diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 5f3f823e4..1d8f79c18 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -296,7 +296,7 @@ public class ContactsManager extends ContentObserver {
 	}
 	
 	public synchronized void refreshSipContact(LinphoneFriend lf) {
-		LinphoneContact contact = ((LinphoneFriendImpl)lf).getLinphoneContact();
+		LinphoneContact contact = (LinphoneContact)((LinphoneFriendImpl)lf).getUserData();
 		if (!sipContacts.contains(contact)) {
 			sipContacts.add(contact);
 		}
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 17802bf82..9f1168a25 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -416,7 +416,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			if (isAndroidContact()) {
 				friend.setRefKey(getAndroidId());
 			}
-			((LinphoneFriendImpl)friend).setLinphoneContact(this);
+			((LinphoneFriendImpl)friend).setUserData(this);
 			created = true;
 		}
 		if (isLinphoneFriend()) {
@@ -573,7 +573,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 
 	public void setFriend(LinphoneFriend f) {
 		friend = f;
-		((LinphoneFriendImpl)friend).setLinphoneContact(this);
+		((LinphoneFriendImpl)friend).setUserData(this);
 	}
 	
 	public void getAndroidIds() {
@@ -705,7 +705,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		friend.enableSubscribes(false);
 		friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);
 		contact.friend = friend;
-		((LinphoneFriendImpl)friend).setLinphoneContact(contact);
+		((LinphoneFriendImpl)friend).setUserData(contact);
 		return contact;
 	}
 
diff --git a/submodules/linphone b/submodules/linphone
index 5500c7455..e2a58c43e 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5500c7455d75f083a8dd3bbaebd42fb13f40b626
+Subproject commit e2a58c43ef0193b33346272ee3a2a9aadd53b7b5