diff --git a/Classes/Contact.m b/Classes/Contact.m
index 6e99cccf0..bac49ea09 100644
--- a/Classes/Contact.m
+++ b/Classes/Contact.m
@@ -197,8 +197,8 @@
 	if (_person) {
 		normSip = [self setOrCreateSipContactEntry:index withValue:sip];
 		NSDictionary *lDict = @{
-			(NSString *)kABPersonInstantMessageUsernameKey : normSip ? normSip : sip,
-			(NSString *)kABPersonInstantMessageServiceKey : LinphoneManager.instance.contactSipField
+			(NSString *) kABPersonInstantMessageUsernameKey : normSip ? normSip : sip, (NSString *)
+			kABPersonInstantMessageServiceKey : LinphoneManager.instance.contactSipField
 		};
 
 		ret = [self replaceInProperty:kABPersonInstantMessageProperty value:(__bridge CFTypeRef)(lDict) atIndex:index];
@@ -358,8 +358,8 @@
 	CFErrorRef error = NULL;
 
 	NSDictionary *lDict = @{
-		(NSString *)kABPersonInstantMessageUsernameKey : value,
-		(NSString *)kABPersonInstantMessageServiceKey : [LinphoneManager instance].contactSipField
+		(NSString *) kABPersonInstantMessageUsernameKey : value, (NSString *)
+		kABPersonInstantMessageServiceKey : [LinphoneManager instance].contactSipField
 	};
 
 	if (![self replaceInProperty:kABPersonInstantMessageProperty value:(__bridge CFTypeRef)(lDict) atIndex:index]) {
diff --git a/Classes/LinphoneUI/UIAvatarPresence.m b/Classes/LinphoneUI/UIAvatarPresence.m
index 2074bbde6..dc626f94f 100644
--- a/Classes/LinphoneUI/UIAvatarPresence.m
+++ b/Classes/LinphoneUI/UIAvatarPresence.m
@@ -57,10 +57,11 @@ INIT_WITH_COMMON_CF {
 		_friend ? linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(_friend))
 				: LinphonePresenceBasicStatusClosed;
 	const LinphonePresenceModel *model = _friend ? linphone_friend_get_presence_model(_friend) : NULL;
-	LinphonePresenceActivity *activity = model ? linphone_presence_model_get_activity(model):NULL;
+	LinphonePresenceActivity *activity = model ? linphone_presence_model_get_activity(model) : NULL;
 
 	LOGE(@"Friend %s status is now %s/%s since %@", _friend ? linphone_friend_get_name(_friend) : "NULL",
-		 basic == LinphonePresenceBasicStatusOpen ? "open" : "closed", activity? linphone_presence_activity_to_string(activity):"Unknown",
+		 basic == LinphonePresenceBasicStatusOpen ? "open" : "closed",
+		 activity ? linphone_presence_activity_to_string(activity) : "Unknown",
 		 [NSDate dateWithTimeIntervalSince1970:linphone_presence_model_get_timestamp(model)]);
 
 	NSString *imageName;
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m
index 8cca9e4b7..326441ad7 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.m
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m
@@ -150,8 +150,8 @@
 		[_messageText setAccessibilityLabel:@"Outgoing message"];
 	} else {
 		[_messageText setAccessibilityLabel:@"Incoming message"];
-		if (!([UIApplication sharedApplication].applicationState != UIApplicationStateBackground ||
-			  [UIApplication sharedApplication].applicationState != UIApplicationStateInactive)) {
+		if (!([UIApplication sharedApplication].applicationState == UIApplicationStateBackground ||
+			  [UIApplication sharedApplication].applicationState == UIApplicationStateInactive)) {
 			VIEW(ChatConversationView).markAsRead;
 		}
 	}
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index bc6df3cfa..adfd9bf28 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit bc6df3cfa2c2f8cc54fb225735374c246b68721b
+Subproject commit adfd9bf2811f94337364642d2115c93c8ef5d05f
diff --git a/submodules/linphone b/submodules/linphone
index 0ea7e7cf0..332351d29 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0ea7e7cf0eb3b1ac9e1462a1126f8b1543f02ea3
+Subproject commit 332351d294fd94acf78e947bae91bd7d7d143132