diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 51483dfed..2b11b6e8e 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -309,7 +309,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		[self setInteger:linphone_core_get_upload_bandwidth(lc) forKey:@"upload_bandwidth_preference"];
 		[self setInteger:linphone_core_get_download_bandwidth(lc) forKey:@"download_bandwidth_preference"];
 		[self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"];
-		[self setCString:linphone_core_get_adaptive_rate_algorithm(lc) forKey:@"adaptive_rate_algorithm_preference"];
 	}
 
 	// tunnel section
@@ -719,8 +718,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			linphone_core_set_media_encryption(lc, LinphoneMediaEncryptionNone);
 
 		linphone_core_enable_adaptive_rate_control(lc, [self boolForKey:@"adaptive_rate_control_preference"]);
-		linphone_core_set_adaptive_rate_algorithm(lc, [[self stringForKey:@"adaptive_rate_algorithm_preference"]
-														  cStringUsingEncoding:[NSString defaultCStringEncoding]]);
 	}
 
 	// tunnel section
diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist
index e97766b92..4a87839d1 100644
--- a/Settings/InAppSettings.bundle/Network.plist
+++ b/Settings/InAppSettings.bundle/Network.plist
@@ -172,26 +172,6 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<string>Simple</string>
-			<key>Key</key>
-			<string>adaptive_rate_algorithm_preference</string>
-			<key>Title</key>
-			<string>Adaptive rate algorithm</string>
-			<key>Titles</key>
-			<array>
-				<string>Simple</string>
-				<string>Stateful</string>
-			</array>
-			<key>Type</key>
-			<string>PSMultiValueSpecifier</string>
-			<key>Values</key>
-			<array>
-				<string>Simple</string>
-				<string>Stateful</string>
-			</array>
-		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/TestsUI/ChatTester.m b/TestsUI/ChatTester.m
index 4c9bf5c1a..a49d9268c 100644
--- a/TestsUI/ChatTester.m
+++ b/TestsUI/ChatTester.m
@@ -160,17 +160,14 @@
 	// create lots of chat rooms...
 	LinphoneCore *lc = [LinphoneManager getLc];
 	for (int i = 0; i < 100; i++) {
-		LinphoneChatRoom *room =
-			linphone_core_get_chat_room_from_uri(lc, [[NSString stringWithFormat:@"%@ - %d", [self me], i] UTF8String]);
-		linphone_chat_room_send_message(room, "Hello");
+		linphone_core_get_chat_room_from_uri(lc, [[NSString stringWithFormat:@"%@ - %d", [self me], i] UTF8String]);
 	}
 
-	[tester waitForTimeInterval:5]; // wait for all messages to be delivered
-
 	NSTimeInterval before = [[NSDate date] timeIntervalSince1970];
 	[tester tapViewWithAccessibilityLabel:@"Chat"];
 	NSTimeInterval after = [[NSDate date] timeIntervalSince1970];
 
+	XCTAssertEqual([[self findTableView:@"ChatRoom list"] numberOfRowsInSection:0], 100);
 	// conversation loading MUST be less than 1 sec
 	XCTAssertLessThan(after - before, 1.);
 }
diff --git a/TestsUI/LinphoneTestCase.m b/TestsUI/LinphoneTestCase.m
index dff0fadf9..8980a0d3d 100644
--- a/TestsUI/LinphoneTestCase.m
+++ b/TestsUI/LinphoneTestCase.m
@@ -24,7 +24,6 @@
 	if (!([language isEqualToString:@"en"] || [language containsString:@"en-"])) {
 		LOGF(@"Language must be 'en' (English) instead of %@", language);
 	}
-	linphone_core_set_log_level(ORTP_MESSAGE);
 }
 
 - (void)beforeAll {