diff --git a/Classes/ContactDetailsTableView.m b/Classes/ContactDetailsTableView.m
index a0fa07de3..9e4124008 100644
--- a/Classes/ContactDetailsTableView.m
+++ b/Classes/ContactDetailsTableView.m
@@ -118,8 +118,8 @@
 }
 
 - (BOOL)isValid {
-	BOOL hasName = (_contact.firstName.length + _contact.lastName.length > 0)BOOL hasAddr =
-		((NSString *)_contact.phoneNumbers[0]).length + ((NSString *)_contact.sipAddresses[0]).length > 0;
+	BOOL hasName = (_contact.firstName.length + _contact.lastName.length > 0);
+	BOOL hasAddr = ((NSString *)_contact.phoneNumbers[0]).length + ((NSString *)_contact.sipAddresses[0]).length > 0;
 	return hasName && hasAddr;
 }
 
diff --git a/Settings/InAppSettings.bundle/Video.plist b/Settings/InAppSettings.bundle/Video.plist
index 4d72625e6..439ee4ad8 100644
--- a/Settings/InAppSettings.bundle/Video.plist
+++ b/Settings/InAppSettings.bundle/Video.plist
@@ -140,11 +140,11 @@
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
-			<false/>
+			<true/>
 			<key>Key</key>
-			<string>mp4v-es_preference</string>
+			<string>vp8_preference</string>
 			<key>Title</key>
-			<string>MPEG-4</string>
+			<string>VP8</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -160,11 +160,11 @@
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
-			<true/>
+			<false/>
 			<key>Key</key>
-			<string>vp8_preference</string>
+			<string>mp4v-es_preference</string>
 			<key>Title</key>
-			<string>VP8</string>
+			<string>MPEG-4</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
diff --git a/submodules/belle-sip b/submodules/belle-sip
index ae856fa95..681d6a7c0 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit ae856fa959a93ca6a9abc9b37cf27100cbf2a60d
+Subproject commit 681d6a7c024dc4a7b42368493b49541d9e8f3d75
diff --git a/submodules/linphone b/submodules/linphone
index 6574a95fd..49d0eadba 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6574a95fd755216b8b91616772cdf4f986214cc6
+Subproject commit 49d0eadbab1f10439fb68994f6d34585baff3487