diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index c1451b6b6..63b971ea1 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -885,9 +885,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 	
 	@Override
-	public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneAddress from, LinphoneChatMessage message) {
+	public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message) {
 		for (LinphoneSimpleListener listener : getSimpleListeners(LinphoneActivity.class)) {
-			((LinphoneActivity) listener).onMessageReceived(from, message);
+			((LinphoneActivity) listener).onMessageReceived(message.getFrom(), message);
 		}
 	}
 
diff --git a/src/org/linphone/core/LinphoneChatMessageImpl.java b/src/org/linphone/core/LinphoneChatMessageImpl.java
index a93aae85f..62fac1dc3 100644
--- a/src/org/linphone/core/LinphoneChatMessageImpl.java
+++ b/src/org/linphone/core/LinphoneChatMessageImpl.java
@@ -4,9 +4,10 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	protected final long nativePtr;
 	private native void setUserData(long ptr);
 	private native String getMessage(long ptr);
-	private native LinphoneAddress getPeerAddress(long ptr);
+	private native long getPeerAddress(long ptr);
 	private native String getExternalBodyUrl(long ptr);
 	private native void setExternalBodyUrl(long ptr, String url);
+	private native long getFrom(long ptr);
 	
 	protected LinphoneChatMessageImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
@@ -35,7 +36,7 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	
 	@Override
 	public LinphoneAddress getPeerAddress() {
-		return getPeerAddress(nativePtr);
+		return new LinphoneAddressImpl(getPeerAddress(nativePtr));
 	}
 	
 	@Override
@@ -47,4 +48,9 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	public void setExternalBodyUrl(String url) {
 		setExternalBodyUrl(nativePtr, url);
 	}
+	
+	@Override
+	public LinphoneAddress getFrom() {
+		return new LinphoneAddressImpl(getFrom(nativePtr));
+	}
 }
diff --git a/src/org/linphone/core/LinphoneChatRoomImpl.java b/src/org/linphone/core/LinphoneChatRoomImpl.java
index 806e8b68a..83141ad1c 100644
--- a/src/org/linphone/core/LinphoneChatRoomImpl.java
+++ b/src/org/linphone/core/LinphoneChatRoomImpl.java
@@ -44,11 +44,7 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
 		sendMessage2(nativePtr, message.getNativePtr(), listener);
 		
 	}
-	@Override
-	public void sendMessage(Object opaque, String message) {
-		// ignore, deprecated.
-		
-	}
+
 	@Override
 	public LinphoneChatMessage createLinphoneChatMessage(String message) {
 		return new LinphoneChatMessageImpl(createLinphoneChatMessage(nativePtr, message));
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 8a870cc0e..8677cb285 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -736,4 +736,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public String getVersion() {
 		return getVersion(nativePtr);
 	}
+	
+	@Override
+	public PayloadType findPayloadType(String mime, int clockRate) {
+		return null;
+	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index 417d5d93e..a1961faa4 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 417d5d93e096c20ddf60da895682e412a779b572
+Subproject commit a1961faa44b1306e5c04285a00ec98ccd9328ff9