diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index c8518d79c..0c34c6a93 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -730,6 +730,11 @@ public class ChatMessagesFragment extends Fragment
     }
 
     private void initChatRoom() {
+        if (mChatRoom != null) {
+            // Required on tablets
+            mChatRoom.removeListener(this);
+        }
+
         Core core = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
         if (mRemoteSipAddress == null
                 || mRemoteSipUri == null
@@ -817,6 +822,7 @@ public class ChatMessagesFragment extends Fragment
         if (!mChatRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt())) {
             mChatRoomSecurityLevel.setVisibility(View.GONE);
         } else {
+            mChatRoomSecurityLevel.setVisibility(View.VISIBLE);
             ChatRoomSecurityLevel level = mChatRoom.getSecurityLevel();
             switch (level) {
                 case Safe:
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 21967c0ac..f7b674d73 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -463,6 +463,8 @@ Disponible gratuitement ici : %s</string>
   <string name="pref_service_notification">Notification de service</string>
   <string name="pref_autostart">Démarrer au lancement du téléphone</string>
   <string name="pref_incoming_call_timeout_title">Ignorer les appels entrants après (en secondes)</string>
+  <string name="pref_device_name">Nom de l\'appareil</string>
+  <string name="pref_display_name_subtitle">Les changements seront appliqués au prochain démarrage</string>
   <string name="pref_remote_provisioning_title">Configuration distante</string>
   <string name="pref_android_app_settings_title">Infos appli Android</string>
   <string name="pref_android_app_notif_settings_title">Paramètres des notifications Android</string>