diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 0c96d1f22..29120d0e7 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -474,10 +474,10 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 
 	private void displayAttachedFile(ChatMessage message, ChatBubbleViewHolder holder) {
 		holder.fileName.setVisibility(View.VISIBLE);
-		holder.fileName.setText(message.getFileTransferInformation().getName());
 
 		String appData = message.getAppdata();
 		if (appData != null) {
+			holder.fileName.setText(LinphoneUtils.getNameFromFilePath(appData));
 			if (LinphoneUtils.isExtensionImage(appData)) {
 				holder.messageImage.setVisibility(View.VISIBLE);
 				loadBitmap(appData, holder.messageImage);