diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index 5eda44602..70af2f015 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -63,17 +63,17 @@
             android:cacheColorHint="@color/transparent"
             android:dividerHeight="1dp" />
 
-        <TextView
-            android:id="@+id/noChatHistory"
-            android:text="@string/no_chat_history"
-            style="@style/font6"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"/>
-
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/noChatHistory"
+        android:text="@string/no_chat_history"
+        style="@style/font6"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"/>
+
     <include layout="@layout/wait_layout" android:id="@+id/waitScreen"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index e5148f2d4..844098f86 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -78,6 +78,7 @@ public class ChatListFragment extends Fragment implements OnItemClickListener, C
 		mChatRoomsList.setOnItemClickListener(this);
 
 		mNoChatHistory = view.findViewById(R.id.noChatHistory);
+		mNoChatHistory.setVisibility(View.GONE);
 
 		mNewDiscussionButton = view.findViewById(R.id.new_discussion);
 		mNewDiscussionButton.setOnClickListener(new View.OnClickListener() {
@@ -114,6 +115,7 @@ public class ChatListFragment extends Fragment implements OnItemClickListener, C
 
 	private void refreshChatRoomsList() {
 		mChatRoomsAdapter.refresh();
+		mNoChatHistory.setVisibility(mChatRoomsAdapter.getCount() == 0 ? View.VISIBLE : View.GONE);
 	}
 
 	@Override