diff --git a/Classes/ChatConversationTableView.m b/Classes/ChatConversationTableView.m
index b21eeff02..7ff025ea4 100644
--- a/Classes/ChatConversationTableView.m
+++ b/Classes/ChatConversationTableView.m
@@ -164,30 +164,32 @@
 	LinphoneEventLog *event = bctbx_list_nth_data(eventList, (int)[indexPath row]);
 	if (linphone_event_log_get_type(event) == LinphoneEventLogTypeConferenceChatMessage) {
 		LinphoneChatMessage *chat = linphone_event_log_get_chat_message(event);
-		if (linphone_chat_message_get_file_transfer_information(chat) ||
-			linphone_chat_message_get_external_body_url(chat)) {
+		if (linphone_chat_message_get_file_transfer_information(chat) || linphone_chat_message_get_external_body_url(chat))
 			kCellId = NSStringFromClass(UIChatBubblePhotoCell.class);
-		} else {
+		else
 			kCellId = NSStringFromClass(UIChatBubbleTextCell.class);
-		}
+
 		UIChatBubbleTextCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId];
-		if (cell == nil) {
+		if (cell == nil)
 			cell = [[NSClassFromString(kCellId) alloc] initWithIdentifier:kCellId];
-		}
+
 		[cell setChatMessage:chat];
-		if (chat) {
+		if (chat)
 			[cell update];
-		}
+
 		[cell setChatRoomDelegate:_chatRoomDelegate];
 		[super accessoryForCell:cell atPath:indexPath];
 		cell.selectionStyle = UITableViewCellSelectionStyleNone;
 		return cell;
 	} else {
+		if (linphone_event_log_is_full_state(event))
+			return NULL;
+
 		kCellId = NSStringFromClass(UIChatNotifiedEventCell.class);
 		UIChatNotifiedEventCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId];
-		if (cell == nil) {
+		if (cell == nil)
 			cell = [[NSClassFromString(kCellId) alloc] initWithIdentifier:kCellId];
-		}
+
 		[cell setEvent:event];
 		[super accessoryForCell:cell atPath:indexPath];
 		cell.selectionStyle = UITableViewCellSelectionStyleNone;
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m
index 4791bb88c..8a8a10dde 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.m
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m
@@ -90,7 +90,7 @@
 	if (url || last_content) {
 		return @"🗻";
 	} else {
-		const char *text = linphone_chat_message_get_text(message) ?: "";
+		const char *text = linphone_chat_message_get_text_content(message) ?: "";
 		return [NSString stringWithUTF8String:text] ?: [NSString stringWithCString:text encoding:NSASCIIStringEncoding]
 														   ?: NSLocalizedString(@"(invalid string)", nil);
 	}
diff --git a/submodules/belle-sip b/submodules/belle-sip
index e3b9709cc..51906fb43 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit e3b9709cc5c01250aa944a7cb6f8abbee885113f
+Subproject commit 51906fb43d56a698f86f5d72b3fe0ead4ad22910
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index ddddd2b3b..96d053fac 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit ddddd2b3bc66604225c26b6cdecaf3c91680deda
+Subproject commit 96d053faca4a35bfd27eef64a081c0a193c97735
diff --git a/submodules/linphone b/submodules/linphone
index 8e05e6a21..95ab4ff58 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 8e05e6a21f0770e4e00fbf316568645bebaf41c0
+Subproject commit 95ab4ff5855b0472b1d187dafe4e35fe4beefb82