diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index e29b938fd..79984b25c 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -715,6 +715,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 		}
 
 		if (msg == null && text != null && text.length() > 0 && !textSend) {
+			msg = mChatRoom.createEmptyMessage();
 			msg.addTextContent(text);
 			// Set listener not required here anymore, message will be added to messages list and adapter will set the listener
 			msg.send();
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 8ddf463c7..81f2fa301 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 8ddf463c700cc8b3635f00cc48da627ce2127216
+Subproject commit 81f2fa301e392a33e63fb6ac6ded9b9d48832605
diff --git a/submodules/linphone b/submodules/linphone
index 6edf43c37..d9d7f754d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6edf43c37dfc4e2c4d785fd4068748a158a4b264
+Subproject commit d9d7f754d2ddc87eeb0b35bb05b482e78541f358
diff --git a/submodules/oRTP b/submodules/oRTP
index b87af6aab..035ce38af 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit b87af6aabbbb9a6ba935e2d4e4ba132a841014fd
+Subproject commit 035ce38af031fae040b2a32dcd7eb3f8698b8a42