diff --git a/res/raw/cpim_grammar b/res/raw/cpim_grammar
index 6f8b36d95..066afb558 100644
Binary files a/res/raw/cpim_grammar and b/res/raw/cpim_grammar differ
diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java
index a41489930..55374c510 100644
--- a/src/android/org/linphone/chat/ImdnFragment.java
+++ b/src/android/org/linphone/chat/ImdnFragment.java
@@ -198,7 +198,6 @@ public class ImdnFragment extends Fragment {
 		boolean first = true;
 		for (ParticipantImdnState participant : participants) {
 			Address address = participant.getParticipant().getAddress();
-			if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
 
 			LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
 			String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
@@ -222,7 +221,6 @@ public class ImdnFragment extends Fragment {
 		first = true;
 		for (ParticipantImdnState participant : participants) {
 			Address address = participant.getParticipant().getAddress();
-			if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
 
 			LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
 			String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
@@ -246,7 +244,6 @@ public class ImdnFragment extends Fragment {
 		first = true;
 		for (ParticipantImdnState participant : participants) {
 			Address address = participant.getParticipant().getAddress();
-			if (!mMessage.isOutgoing() && address.weakEqual(remoteSender)) continue;
 
 			LinphoneContact participantContact = ContactsManager.getInstance().findContactFromAddress(address);
 			String participantDisplayName = participantContact != null ? participantContact.getFullName() : LinphoneUtils.getAddressDisplayName(address);
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index e9473d2e5..7df8b5ca0 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit e9473d2e5772c9ad1aea83c504b9c6aa9a92bc67
+Subproject commit 7df8b5ca085010ec35103414ed9582412aaff97d
diff --git a/submodules/belcard b/submodules/belcard
index 8c1027652..7376c8ba9 160000
--- a/submodules/belcard
+++ b/submodules/belcard
@@ -1 +1 @@
-Subproject commit 8c1027652d3219521a6d9112614066a9cc9f8cb1
+Subproject commit 7376c8ba975617c8b2a7232c3acc428513a4ae8f
diff --git a/submodules/belle-sip b/submodules/belle-sip
index a9af682b9..cbb4ab4c2 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit a9af682b9931213743c0af65e261e70e2280b1c9
+Subproject commit cbb4ab4c2a58e4fa1954043f6b17266e1685c887
diff --git a/submodules/linphone b/submodules/linphone
index 90ca06096..480cca5f5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 90ca06096cb4fa875e279f19f1bbcf5830dff4c5
+Subproject commit 480cca5f5be39723359a30a319f64f37607cc437
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 0be2e0ed8..ad4cdb240 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0be2e0ed887ea9db50666d98f0059c92a3f38ad8
+Subproject commit ad4cdb240e553654f87438fb4519754e90d1773d
diff --git a/submodules/oRTP b/submodules/oRTP
index 996a3d651..1fcd6fd15 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit 996a3d651288e7976581c1b77e2a439c3cfb255d
+Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b