diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 325d127a8..436eaa34a 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -767,15 +767,16 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	}
 
 	@Override
-	public synchronized void onLinphoneChatMessageStateChanged(final LinphoneChatMessage msg, final State state) {
-		final String finalMessage = msg.getText();
-		final String finalImage = msg.getExternalBodyUrl();
+	public synchronized void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) {
+		final LinphoneChatMessage finalMessage = msg;
+		final String finalImage = finalMessage.getExternalBodyUrl();
+		final State finalState=state;
 		if (LinphoneActivity.isInstanciated() && state != State.InProgress) {
 			mHandler.post(new Runnable() {
 				@Override
 				public void run() {
 					if (finalMessage != null && !finalMessage.equals("")) {
-						LinphoneActivity.instance().onMessageStateChanged(sipUri, finalMessage, state.toInt());
+						LinphoneActivity.instance().onMessageStateChanged(sipUri, finalMessage.getText(), finalState.toInt());
 					} else if (finalImage != null && !finalImage.equals("")) {
 						if (latestImageMessages != null && latestImageMessages.containsValue(finalImage)) {
 							int id = -1;
@@ -787,15 +788,15 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 								}
 							}
 							if (id != -1) {
-								LinphoneActivity.instance().onImageMessageStateChanged(sipUri, id, state.toInt());
+								LinphoneActivity.instance().onImageMessageStateChanged(sipUri, id, finalState.toInt());
 							}
 						}
 					}
 					
 					if (lastSentMessagesBubbles != null && lastSentMessagesBubbles.size() > 0) {
 						for (BubbleChat bubble : lastSentMessagesBubbles) {
-							if (bubble.getNativeMessageObject() == msg) {
-								bubble.updateStatusView(state);
+							if (bubble.getNativeMessageObject() == finalMessage) {
+								bubble.updateStatusView(finalState);
 							}
 						}
 					}
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index b90cbdeb5..c4df87d00 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -688,7 +688,7 @@ public class LinphoneManager implements LinphoneCoreListener {
 	private Vibrator mVibrator;
 
 	public void displayWarning(LinphoneCore lc, String message) {}
-	public void authInfoRequested(LinphoneCore lc, String realm, String username) {}
+	public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {}
 	public void byeReceived(LinphoneCore lc, String from) {}
 	public void displayMessage(LinphoneCore lc, String message) {}
 	public void show(LinphoneCore lc) {}
diff --git a/submodules/linphone b/submodules/linphone
index 643d39637..fd8136016 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 643d39637bb0130d35275fbaaeb0b24d31122345
+Subproject commit fd813601605e2f4e2cbd70e2cdb96806e3e78e41