diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m
index 6091ab727..5ffe5addb 100644
--- a/Classes/HistoryTableViewController.m
+++ b/Classes/HistoryTableViewController.m
@@ -185,11 +185,8 @@
         }
         if(useLinphoneAddress) {
             const char* lDisplayName = linphone_address_get_display_name(addr);
-            const char* lUserName = linphone_address_get_username(addr);
-            if (lDisplayName) 
+            if (lDisplayName)
                 displayName = [NSString stringWithUTF8String:lDisplayName];
-            else if(lUserName) 
-                displayName = [NSString stringWithUTF8String:lUserName];
         }
     }
     
diff --git a/submodules/belle-sip b/submodules/belle-sip
index dc04f9f97..8e571e5f6 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit dc04f9f970157bd2de57676aa9fb6cfbbea084a6
+Subproject commit 8e571e5f641c0bd673ce191d237d3cb2f0eac63c
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 7c8d07380..d5dc92075 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -77,6 +77,8 @@ $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties:
 	rm -f $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties
 	cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile 
 
+enable_gpl_third_parties?=yes
+
 ifeq ($(enable_gpl_third_parties),yes) 
 linphone_configure_controls+= --enable-ffmpeg 
 detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties
diff --git a/submodules/linphone b/submodules/linphone
index bdd9839de..89f3e2ced 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit bdd9839dea820ec38171b3a6a8ea14358bf9210b
+Subproject commit 89f3e2ceda901574092b14bd37a5079e9d95ed84