diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index 0a77f0cef..1f9eff58c 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -119,7 +119,6 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene
 			@Override
 			public void onConferenceJoined(ChatRoom cr, EventLog eventLog) {
 				refreshChatRoomsList();
-				cr.removeListener(mChatRoomRefresher);
 			}
 		};
 
diff --git a/src/android/org/linphone/chat/ChatRoomsAdapter.java b/src/android/org/linphone/chat/ChatRoomsAdapter.java
index db062be4b..7d7a6f7d8 100644
--- a/src/android/org/linphone/chat/ChatRoomsAdapter.java
+++ b/src/android/org/linphone/chat/ChatRoomsAdapter.java
@@ -294,18 +294,14 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 		} else {
 			holder.displayName.setText(chatRoom.getSubject());
 			ChatRoomSecurityLevel level = chatRoom.getSecurityLevel();
-			if (LinphoneManager.getLc().limeV2Enabled()) {
-				if (level == ChatRoomSecurityLevel.Safe) {
-					holder.contactPicture.setImageResource(R.drawable.avatar_group_small_secure2);
-				} else if (level == ChatRoomSecurityLevel.Unsafe) {
-					holder.contactPicture.setImageResource(R.drawable.avatar_group_small_unsecure);
-				} else if (level == ChatRoomSecurityLevel.Encrypted) {
-					holder.contactPicture.setImageResource(R.drawable.avatar_group_small_secure1);
-				} else {
-					holder.contactPicture.setImageResource(R.drawable.avatar_group_small_unregistered);
-				}
+			if (level == ChatRoomSecurityLevel.Safe) {
+				holder.contactPicture.setImageResource(R.drawable.avatar_group_small_secure2);
+			} else if (level == ChatRoomSecurityLevel.Unsafe) {
+				holder.contactPicture.setImageResource(R.drawable.avatar_group_small_unsecure);
+			} else if (level == ChatRoomSecurityLevel.Encrypted) {
+				holder.contactPicture.setImageResource(R.drawable.avatar_group_small_secure1);
 			} else {
-				holder.contactPicture.setImageBitmap(mDefaultGroupBitmap);
+				holder.contactPicture.setImageResource(R.drawable.avatar_group_small_unregistered);
 			}
 		}