diff --git a/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java b/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java
index 8bc711aaf..dcb2ed956 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java
@@ -73,18 +73,16 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
         ChatMessage lastMessage = mRoom.getLastMessageInHistory();
 
         if (lastMessage != null) {
-            String text = lastMessage.getTextContent();
-            if (text != null && text.length() > 0) {
-                lastMessageView.setText(getSender(mRoom) + text);
-            }
-            date.setText(LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format));
-            String files = "";
+            String messageContent = "";
             for (Content c : lastMessage.getContents()) {
                 if (c.isFile() || c.isFileTransfer()) {
-                    files += c.getName() + " ";
+                    messageContent += c.getName() + " ";
+                } else if (c.isText()) {
+                    messageContent = c.getStringBuffer() + " " + messageContent;
                 }
             }
-            lastMessageView.setText(getSender(mRoom) + files);
+            lastMessageView.setText(getSender(mRoom) + messageContent);
+            date.setText(LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format));
         } else {
             date.setText("");
             lastMessageView.setText("");
diff --git a/app/src/main/res/raw/linphonerc_factory b/app/src/main/res/raw/linphonerc_factory
index 5d18efde5..17a933af3 100644
--- a/app/src/main/res/raw/linphonerc_factory
+++ b/app/src/main/res/raw/linphonerc_factory
@@ -67,5 +67,5 @@ lime_v2=1
 x3dh_server_url=http://54.37.202.229:8082/flexisip-account-manager/x3dh-25519.php
 lime_update_threshold=86400
 max_nb_device_per_participant=255
-allow_message_in_unsafe_chatroom=0
+allow_message_in_unsafe_chatroom=1
 unsafe_if_sas_refused=1