diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index 7ee49db81..e5148f2d4 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -160,10 +160,10 @@ public class ChatListFragment extends Fragment implements OnItemClickListener, C
 			for (EventLog eventLog : room.getHistoryEvents(0)) {
 				if (eventLog.getType() == EventLog.Type.ConferenceChatMessage) {
 					ChatMessage message = eventLog.getChatMessage();
-					if (message.getAppdata() != null) {
+					if (message.getAppdata() != null && !message.isOutgoing()) {
 						File file = new File(message.getAppdata());
 						if (file.exists()) {
-							file.delete();
+							file.delete(); // Delete downloaded file from incoming message that will be deleted
 						}
 					}
 				}
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 8d1134c9e..0c8f94254 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -286,10 +286,10 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			EventLog eventLog = (EventLog)obj;
 			if (eventLog.getType() == EventLog.Type.ConferenceChatMessage) {
 				ChatMessage message = eventLog.getChatMessage();
-				if (message.getAppdata() != null) {
+				if (message.getAppdata() != null && !message.isOutgoing()) {
 					File file = new File(message.getAppdata());
 					if (file.exists()) {
-						file.delete();
+						file.delete(); // Delete downloaded file from incoming message that will be deleted
 					}
 				}
 			}