diff --git a/Classes/ChatTableViewController.m b/Classes/ChatTableViewController.m
index 0d11fb767..ed656c698 100644
--- a/Classes/ChatTableViewController.m
+++ b/Classes/ChatTableViewController.m
@@ -82,12 +82,8 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo
 		// store last message in user data
 		LinphoneChatRoom *chat_room = iter->data;
 		MSList *history = linphone_chat_room_get_history(iter->data, 1);
-		assert(ms_list_size(history) <= 1);
 		LinphoneChatMessage *last_msg = history ? history->data : NULL;
-		if (last_msg) {
-			linphone_chat_message_ref(last_msg);
-			linphone_chat_room_set_user_data(chat_room, last_msg);
-		}
+		linphone_chat_room_set_user_data(chat_room, last_msg);
 		sorted = ms_list_insert_sorted(sorted, chat_room, (MSCompareFunc)sorted_history_comparison);
 
 		iter = iter->next;
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index 5852f2a24..d7e007e7d 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -953,8 +953,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 												  otherButtonTitles:nil, nil];
 		[errorView show];
 	} else if ([response object] != nil) { // Don't handle if not object: HTTP/Communication Error
+		NSString *value = [response object];
 		if ([[request method] isEqualToString:@"check_account"]) {
-			if ([response object] == [NSNumber numberWithInt:1]) {
+			if ([value integerValue] == 1) {
 				UIAlertView *errorView =
 					[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Check issue", nil)
 											   message:NSLocalizedString(@"Username already exists", nil)
@@ -970,7 +971,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 				[self createAccount:identity password:password email:email];
 			}
 		} else if ([[request method] isEqualToString:@"create_account_with_useragent"]) {
-			if ([response object] == [NSNumber numberWithInt:0]) {
+			if ([value integerValue] == 0) {
 				NSString *username = [WizardViewController findTextField:ViewElement_Username view:contentView].text;
 				NSString *password = [WizardViewController findTextField:ViewElement_Password view:contentView].text;
 				[self changeView:validateAccountView back:FALSE animation:TRUE];
@@ -986,7 +987,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 				[errorView show];
 			}
 		} else if ([[request method] isEqualToString:@"check_account_validated"]) {
-			if ([response object] == [NSNumber numberWithInt:1]) {
+			if ([value integerValue] == 1) {
 				NSString *username = [WizardViewController findTextField:ViewElement_Username view:contentView].text;
 				NSString *password = [WizardViewController findTextField:ViewElement_Password view:contentView].text;
 				[self addProxyConfig:username password:password domain:nil withTransport:nil];
diff --git a/linphone-Info.plist b/linphone-Info.plist
index d7bbb99a0..04f0fcf6b 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.6</string>
+	<string>3.8.5</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.2.6</string>
+	<string>2.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>
diff --git a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
index bb73200b0..f647fdabe 100644
--- a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
+++ b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
@@ -111,7 +111,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Distribution"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 7ec48ad64..3cf82aaf9 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 7ec48ad644bbb7906e2f06e8abde5633b52f1926
+Subproject commit 3cf82aaf9e1a84a8438341b026abd8c13520e005