diff --git a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java
index f70bcb3f2..b463c9bd8 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java
@@ -137,8 +137,13 @@ public class ChatRoomsFragment extends Fragment
                     }
 
                     @Override
-                    public void onMessageReceived(Core core, ChatRoom cr, ChatMessage message) {
-                        refreshChatRoom(cr);
+                    public void onMessageReceived(Core core, ChatRoom room, ChatMessage message) {
+                        refreshChatRoom(room);
+                    }
+
+                    @Override
+                    public void onChatRoomSubjectChanged(Core core, ChatRoom room) {
+                        refreshChatRoom(room);
                     }
 
                     @Override
@@ -154,9 +159,9 @@ public class ChatRoomsFragment extends Fragment
 
                     @Override
                     public void onChatRoomStateChanged(
-                            Core core, ChatRoom cr, ChatRoom.State state) {
+                            Core core, ChatRoom room, ChatRoom.State state) {
                         if (state == ChatRoom.State.Created) {
-                            refreshChatRoom(cr);
+                            refreshChatRoom(room);
                             scrollToTop();
                         }
                     }
@@ -254,6 +259,9 @@ public class ChatRoomsFragment extends Fragment
             mWaitLayout.setVisibility(View.VISIBLE);
         }
         ((ChatActivity) getActivity()).displayMissedChats();
+
+        if (getResources().getBoolean(R.bool.isTablet))
+            ((ChatActivity) getActivity()).showEmptyChildFragment();
     }
 
     @Override
diff --git a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
index 905fe5f22..23c654d0d 100644
--- a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
@@ -26,13 +26,11 @@ import android.app.Dialog;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.provider.ContactsContract.DisplayPhoto;
 import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.InputType;