diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index f92d9a52a..1153a4844 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -296,8 +296,13 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene
 		    }
 		    holder.contactName.setText(LinphoneUtils.timestampToHumanDate(mContext, message.getTime(), R.string.messages_date_format) + " - " + displayName);
 
-		    Spanned text = null;
-		    String msg = message.getText();
+		    if (message.hasTextContent()) {
+			    String msg = message.getTextContent();
+			    Spanned text = LinphoneUtils.getTextWithHttpLinks(msg);
+			    holder.messageText.setText(text);
+			    holder.messageText.setMovementMethod(LinkMovementMethod.getInstance());
+			    holder.messageText.setVisibility(View.VISIBLE);
+		    }
 
 		    String externalBodyUrl = message.getExternalBodyUrl();
 		    Content fileTransferContent = message.getFileTransferInformation();
@@ -348,11 +353,6 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene
 						}
 					});
 				}
-		    } else if (msg != null) { // This is a else for now, the day we'll be able to send both file and text this won't be anymore
-			    text = LinphoneUtils.getTextWithHttpLinks(msg);
-			    holder.messageText.setText(text);
-			    holder.messageText.setMovementMethod(LinkMovementMethod.getInstance());
-			    holder.messageText.setVisibility(View.VISIBLE);
 		    }
 
 		    holder.bubbleLayout.setLayoutParams(layoutParams);
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index f8ec93e70..f440e103f 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -601,6 +601,10 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			msg = mChatRoom.createFileTransferMessage(content);
 			msg.setFileTransferFilepath(filePath); // Let the file body handler take care of the upload
 			msg.setAppdata(filePath);
+
+			if (text != null && text.length() > 0) {
+				msg.addTextContent(text);
+			}
 		} else {
 			msg = mChatRoom.createMessage(text);
 		}