diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index a332440b7..d17cca506 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -702,7 +702,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore *lc, const char
 					data->notification.repeatInterval = 0;
 
 					data->notification.alertBody =
-						[NSString stringWithFormat:NSLocalizedString(@"IC_MSG", nil), address];
+						[NSString stringWithFormat:NSLocalizedString(@"Incoming call from %@", nil), address];
 					data->notification.alertAction = NSLocalizedString(@"Answer", nil);
 					data->notification.userInfo = @{ @"callId" : callId, @"timer" : [NSNumber numberWithInt:1] };
 					data->notification.applicationIconBadgeNumber = 1;
@@ -976,7 +976,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char
 			if ([[UIDevice currentDevice].systemVersion floatValue] >= 8) {
 				notif.category = @"incoming_msg";
 			}
-			notif.alertBody = [NSString stringWithFormat:NSLocalizedString(@"IM_MSG", nil), address];
+			notif.alertBody = [NSString stringWithFormat:NSLocalizedString(@"Incoming message from %@", nil), address];
 			notif.alertAction = NSLocalizedString(@"Show", nil);
 			notif.soundName = @"msg.caf";
 			notif.userInfo = @{ @"from" : address, @"from_addr" : remote_uri, @"call-id" : callID };
@@ -2043,8 +2043,6 @@ static void audioRouteChangeListenerCallback(void *inUserData,					  // 1
 		for (int i = 0; i < [tokenData length]; ++i) {
 			[tokenString appendFormat:@"%02X", (unsigned int)tokenBuffer[i]];
 		}
-// NSLocalizedString(@"IC_MSG", nil); // Fake for genstrings
-// NSLocalizedString(@"IM_MSG", nil); // Fake for genstrings
 #ifdef USE_APN_DEV
 #define APPMODE_SUFFIX @"dev"
 #else
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index c6362341a..a16b264e9 100644
Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index b4d50ae97..a47243281 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 7396b4111..4c7f01725 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index dbe715f2f..95d4318c1 100644
Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ
diff --git a/Tools/i18n_generate_strings_files.sh b/Tools/i18n_generate_strings_files.sh
index 6c18305cb..0af7fccc6 100755
--- a/Tools/i18n_generate_strings_files.sh
+++ b/Tools/i18n_generate_strings_files.sh
@@ -31,24 +31,10 @@ fi
 
 ##### 1. Generate Localizable.strings from source files (.m)
 function generate_localizable_from_sources {
-	#WARNING: in case of sed issue "extra characters at the end of g command", it means that
+	#WARNING: sed issue "extra characters at the end of g command" means that
 	# we are trying to modify an UTF-16 file which is not supported..
-
 	localizable_en=$root_directory/Resources/en.lproj/Localizable.strings
-	# The 2 only specific cases of the application: since we are length limited for push
-	# notifications, the ID is not matching the English translation... so we must keep
-	# the translations!
-	iconv -f utf-16 -t utf-8 $localizable_en > $localizable_en.tmp
-	IC_MSG_EN=$(sed -nE 's/"IC_MSG" = "(.*)";/\1/p' $localizable_en.tmp)
-	IM_MSG_EN=$(sed -nE 's/"IM_MSG" = "(.*)";/\1/p' $localizable_en.tmp)
-	rm -f $localizable_en $localizable_en.tmp
-
 	find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $(dirname $localizable_en)
-	iconv -f utf-16LE -t utf-8 $localizable_en > $localizable_en.tmp
-	sed -i.bak "s/= \"IC_MSG\";/= \"$IC_MSG_EN\";/" $localizable_en.tmp
-	sed -i.bak "s/= \"IM_MSG\";/= \"$IM_MSG_EN\";/" $localizable_en.tmp
-	iconv -f utf-8 -t utf-16LE $localizable_en.tmp > $localizable_en
-	rm $localizable_en.tmp.bak $localizable_en.tmp
 }
 
 ##### 2. Generate .strings for all XIB files
diff --git a/submodules/linphone b/submodules/linphone
index 6bae96a3b..fe9b63d2e 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6bae96a3bffd89ea9ece0d7aa550589214b7d319
+Subproject commit fe9b63d2e86193e7919dc5409e59eb5ffa2c0c17