diff --git a/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib b/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib
index 85125beff..3bc5b8c8e 100644
--- a/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib
@@ -69,7 +69,7 @@
                                         <action selector="onAuthClick:" destination="-1" eventType="touchUpInside" id="9A4-ZX-cXA"/>
                                     </connections>
                                 </button>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Do not ask again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dQL-Sf-slc">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Do not show again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dQL-Sf-slc">
                                     <rect key="frame" x="55" y="2" width="176" height="21"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
diff --git a/Classes/LinphoneUI/UIChatNotifiedEventCell.m b/Classes/LinphoneUI/UIChatNotifiedEventCell.m
index 2432468b7..5fcb68701 100644
--- a/Classes/LinphoneUI/UIChatNotifiedEventCell.m
+++ b/Classes/LinphoneUI/UIChatNotifiedEventCell.m
@@ -100,24 +100,30 @@ static const CGFloat NOTIFIED_CELL_HEIGHT = 44;
             switch (type) {
                 case LinphoneSecurityEventTypeSecurityLevelDowngraded:
                     if (!participant)
-                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Degradation of security level", nil)];
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Security level decreased", nil)];
                     else
-                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Degradation of security level from %@", nil),participant];
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Security level decreased because of %@", nil),participant];
                     eventColor = [UIColor grayColor];
                     break;
                 case LinphoneSecurityEventTypeParticipantMaxDeviceCountExceeded:
                     if (!participant)
-                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Multidevice detected", nil)];
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Max participant count exceeded", nil)];
                     else
-                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Multidevice detected from %@", nil),participant];
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Max participant count exceeded by %@", nil),participant];
                     eventColor = [UIColor redColor];
                     break;
                 case LinphoneSecurityEventTypeEncryptionIdentityKeyChanged:
+                    if (!participant)
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"LIME identity key changed", nil)];
+                    else
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"LIME identity key changed for %@", nil),participant];
+                    eventColor = [UIColor redColor];
+                    break;
                 case LinphoneSecurityEventTypeManInTheMiddleDetected:
                     if (!participant)
-                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Security alert", nil)];
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Man-in-the-middle attack detected", nil)];
                     else
-                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Security alert from %@", nil),participant];
+                        eventString = [NSString stringWithFormat:NSLocalizedString(@"Man-in-the-middle attack detected for %@", nil),participant];
                     eventColor = [UIColor redColor];
                     break;
                     
diff --git a/Classes/LinphoneUI/UIContactDetailsCell.m b/Classes/LinphoneUI/UIContactDetailsCell.m
index b632deb0f..335d05b02 100644
--- a/Classes/LinphoneUI/UIContactDetailsCell.m
+++ b/Classes/LinphoneUI/UIContactDetailsCell.m
@@ -173,7 +173,7 @@
 - (IBAction)onSMSInviteClick:(id)sender {
     MFMessageComposeViewController *controller = [[MFMessageComposeViewController alloc] init];
     if([MFMessageComposeViewController canSendText]) {
-        controller.body = NSLocalizedString(@"Hello! Join me on Linphone! You can download it at: http://www.linphone.org/technical-corner/linphone/downloads",nil);
+        controller.body = NSLocalizedString(@"Hello! Join me on Linphone! You can download it for free at: http://www.linphone.org/technical-corner/linphone/downloads",nil);
         controller.recipients = [NSArray arrayWithObjects:[self.addressLabel text], nil];
         
         controller.messageComposeDelegate = PhoneMainView.instance;
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 2af0c21fd..329a33d24 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/Settings/InAppSettings.bundle/Chat.plist b/Settings/InAppSettings.bundle/Chat.plist
index c9f3622a1..7a79b86d0 100644
--- a/Settings/InAppSettings.bundle/Chat.plist
+++ b/Settings/InAppSettings.bundle/Chat.plist
@@ -15,7 +15,7 @@
 			<array>
 				<string>Never</string>
 				<string>Always</string>
-				<string>If lighter than given size (see below setting)</string>
+				<string>If lighter than max size</string>
 			</array>
 			<key>Type</key>
 			<string>PSMultiValueSpecifier</string>
@@ -30,7 +30,7 @@
 			<key>Key</key>
 			<string>auto_download_incoming_files_max_size</string>
 			<key>Title</key>
-			<string>Max size in bytes</string>
+			<string>Max size (in bytes)</string>
 			<key>DefaultValue</key>
 			<integer>-1</integer>
 			<key>Type</key>