diff --git a/Classes/ChatConversationTableView.m b/Classes/ChatConversationTableView.m
index b903b9bfa..4de6666e5 100644
--- a/Classes/ChatConversationTableView.m
+++ b/Classes/ChatConversationTableView.m
@@ -77,7 +77,7 @@
 	}
     bctbx_list_free_with_data(head, (bctbx_list_free_func)linphone_event_log_unref);
 
-	for (FileTransferDelegate *ftd in [LinphoneManager.instance fileTransferDelegates]) {
+	/*for (FileTransferDelegate *ftd in [LinphoneManager.instance fileTransferDelegates]) {
 		const LinphoneAddress *ftd_peer =
 			linphone_chat_room_get_peer_address(linphone_chat_message_get_chat_room(ftd.message));
 		const LinphoneAddress *peer = linphone_chat_room_get_peer_address(_chatRoom);
@@ -85,7 +85,7 @@
 			LOGI(@"Appending transient upload message %p", ftd.message);
 			//TODO : eventList = bctbx_list_append(eventList, linphone_chat_message_ref(ftd.event));
 		}
-	}
+	}*/
 }
 
 - (void)refreshData {
diff --git a/Classes/LinphoneUI/UIChatBubblePhotoCell.m b/Classes/LinphoneUI/UIChatBubblePhotoCell.m
index b9cf97250..1939b5b30 100644
--- a/Classes/LinphoneUI/UIChatBubblePhotoCell.m
+++ b/Classes/LinphoneUI/UIChatBubblePhotoCell.m
@@ -223,7 +223,7 @@ static const CGFloat CELL_IMAGE_X_MARGIN = 100;
                 _playButton.hidden = ![type isEqualToString:@"video"];
                 _fileName.hidden = _fileView.hidden = _fileButton.hidden = localFile ? NO : YES;
                 // Should fix cell not resizing after doanloading image.
-                [self layoutSubviews];
+                //[self layoutSubviews];
             }
         }
     }