diff --git a/Classes/Swift/Chat/Views/ChatConversationTableViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationTableViewSwift.swift
index 449e259b9..102af5d6b 100644
--- a/Classes/Swift/Chat/Views/ChatConversationTableViewSwift.swift
+++ b/Classes/Swift/Chat/Views/ChatConversationTableViewSwift.swift
@@ -245,11 +245,13 @@ class ChatConversationTableViewSwift: UIViewController, UICollectionViewDataSour
 				}
 			}
 			
-			if (!cell.imageViewBubble.isHidden || !cell.imageVideoViewBubble.isHidden) && cell.chatMessage != nil && !cell.chatMessage!.isFileTransferInProgress {
-				cell.imageViewBubble.onClick {
+			cell.imageViewBubble.onClick {
+				if (!cell.imageViewBubble.isHidden || !cell.imageVideoViewBubble.isHidden) && cell.chatMessage != nil && !cell.chatMessage!.isFileTransferInProgress {
 					self.onImageClick(chatMessage: cell.chatMessage!, index: indexPath.row)
 				}
-				cell.imageVideoViewBubble.onClick {
+			}
+			cell.imageVideoViewBubble.onClick {
+				if (!cell.imageViewBubble.isHidden || !cell.imageVideoViewBubble.isHidden) && cell.chatMessage != nil && !cell.chatMessage!.isFileTransferInProgress {
 					self.onImageClick(chatMessage: cell.chatMessage!, index: indexPath.row)
 				}
 			}
diff --git a/Classes/Swift/Chat/Views/MultilineMessageCell.swift b/Classes/Swift/Chat/Views/MultilineMessageCell.swift
index f868da76f..356982784 100644
--- a/Classes/Swift/Chat/Views/MultilineMessageCell.swift
+++ b/Classes/Swift/Chat/Views/MultilineMessageCell.swift
@@ -961,9 +961,13 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource,
 						mediaSelectorReply.isHidden = true
 						replyContentTextSpacing.isHidden = true
 					}else{
-						
-						if(bctbx_list_size(contentList) > 1 || content == ""){
-							mediaSelectorReply.isHidden = false
+						if(bctbx_list_size(contentList) >= 1){
+							if bctbx_list_size(contentList) == 1 && content != nil {
+								mediaSelectorReply.isHidden = true
+							} else {
+								mediaSelectorReply.isHidden = false
+							}
+							
 							replyContentTextSpacing.isHidden = true
 							ChatMessage.getSwiftObject(cObject: (event.chatMessage!.replyMessage?.getCobject)!).contents.forEach({ content in
 								if(content.isFile){