diff --git a/ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift b/ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift
index eb9ad5ce4..d61ca5d5c 100644
--- a/ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift	
+++ b/ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift	
@@ -34,7 +34,7 @@ public protocol ViewModelBuilderProtocol {
 
 public protocol BaseMessageInteractionHandlerProtocol {
     associatedtype ViewModelT
-    func userDidTapOnFailIcon(viewModel viewModel: ViewModelT)
+    func userDidTapOnFailIcon(viewModel viewModel: ViewModelT, failIconView: UIView)
     func userDidTapOnBubble(viewModel viewModel: ViewModelT)
     func userDidBeginLongPressOnBubble(viewModel viewModel: ViewModelT)
     func userDidEndLongPressOnBubble(viewModel viewModel: ViewModelT)
@@ -113,7 +113,7 @@ public class BaseMessagePresenter<BubbleViewT, ViewModelBuilderT, InteractionHan
             }
             cell.onFailedButtonTapped = { [weak self] (cell) in
                 guard let sSelf = self else { return }
-                sSelf.onCellFailedButtonTapped()
+                sSelf.onCellFailedButtonTapped(cell.failedButton)
             }
             additionalConfiguration?()
         }, animated: animated, completion: nil)
@@ -173,7 +173,7 @@ public class BaseMessagePresenter<BubbleViewT, ViewModelBuilderT, InteractionHan
         self.interactionHandler?.userDidEndLongPressOnBubble(viewModel: self.messageViewModel)
     }
 
-    public func onCellFailedButtonTapped() {
-        self.interactionHandler?.userDidTapOnFailIcon(viewModel: self.messageViewModel)
+    public func onCellFailedButtonTapped(failedButtonView: UIView) {
+        self.interactionHandler?.userDidTapOnFailIcon(viewModel: self.messageViewModel, failIconView: failedButtonView)
     }
 }
diff --git a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift
index 0a880abe3..f287f646f 100644
--- a/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift	
+++ b/ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift	
@@ -176,7 +176,7 @@ public class BaseMessageCollectionViewCell<BubbleViewType where BubbleViewType:U
         self.removeAccessoryView()
     }
 
-    private lazy var failedButton: UIButton = {
+    public lazy var failedButton: UIButton = {
         let button = UIButton(type: .Custom)
         button.addTarget(self, action: #selector(BaseMessageCollectionViewCell.failedButtonTapped), forControlEvents: .TouchUpInside)
         return button
diff --git a/ChattoAdditions/Tests/Chat Items/PhotoMessages/PhotoMessagePresenterTests.swift b/ChattoAdditions/Tests/Chat Items/PhotoMessages/PhotoMessagePresenterTests.swift
index 10b12f253..0740b61c2 100644
--- a/ChattoAdditions/Tests/Chat Items/PhotoMessages/PhotoMessagePresenterTests.swift	
+++ b/ChattoAdditions/Tests/Chat Items/PhotoMessages/PhotoMessagePresenterTests.swift	
@@ -79,7 +79,7 @@ class PhotoMessageTestHandler: BaseMessageInteractionHandlerProtocol {
     typealias ViewModelT = PhotoMessageViewModel<PhotoMessageModel<MessageModel>>
 
     var didHandleTapOnFailIcon = false
-    func userDidTapOnFailIcon(viewModel viewModel: ViewModelT) {
+    func userDidTapOnFailIcon(viewModel viewModel: ViewModelT, failIconView: UIView) {
         self.didHandleTapOnFailIcon = true
     }
 
diff --git a/ChattoAdditions/Tests/Chat Items/TextMessages/TextMessagePresenterTests.swift b/ChattoAdditions/Tests/Chat Items/TextMessages/TextMessagePresenterTests.swift
index 6553ba385..e952b3e5d 100644
--- a/ChattoAdditions/Tests/Chat Items/TextMessages/TextMessagePresenterTests.swift	
+++ b/ChattoAdditions/Tests/Chat Items/TextMessages/TextMessagePresenterTests.swift	
@@ -89,7 +89,7 @@ class TextMessagePresenterTests: XCTestCase, UICollectionViewDataSource {
 class TextMessageTestHandler: BaseMessageInteractionHandlerProtocol {
     typealias ViewModelT = TextMessageViewModel<TextMessageModel<MessageModel>>
 
-    func userDidTapOnFailIcon(viewModel viewModel: ViewModelT) {
+    func userDidTapOnFailIcon(viewModel viewModel: ViewModelT, failIconView: UIView) {
 
     }
 
diff --git a/ChattoApp/ChattoApp/Source/Photo Messages/DemoPhotoMessageHandler.swift b/ChattoApp/ChattoApp/Source/Photo Messages/DemoPhotoMessageHandler.swift
index cddd887bd..3bbe54a3a 100644
--- a/ChattoApp/ChattoApp/Source/Photo Messages/DemoPhotoMessageHandler.swift	
+++ b/ChattoApp/ChattoApp/Source/Photo Messages/DemoPhotoMessageHandler.swift	
@@ -31,7 +31,7 @@ class DemoPhotoMessageHandler: BaseMessageInteractionHandlerProtocol {
         self.baseHandler = baseHandler
     }
 
-    func userDidTapOnFailIcon(viewModel viewModel: DemoPhotoMessageViewModel) {
+    func userDidTapOnFailIcon(viewModel viewModel: DemoPhotoMessageViewModel, failIconView: UIView) {
         self.baseHandler.userDidTapOnFailIcon(viewModel: viewModel)
     }
 
diff --git a/ChattoApp/ChattoApp/Source/Text Messages/DemoTextMessageHandler.swift b/ChattoApp/ChattoApp/Source/Text Messages/DemoTextMessageHandler.swift
index aa20b423d..f3f801815 100644
--- a/ChattoApp/ChattoApp/Source/Text Messages/DemoTextMessageHandler.swift	
+++ b/ChattoApp/ChattoApp/Source/Text Messages/DemoTextMessageHandler.swift	
@@ -30,7 +30,7 @@ class DemoTextMessageHandler: BaseMessageInteractionHandlerProtocol {
     init (baseHandler: BaseMessageHandler) {
         self.baseHandler = baseHandler
     }
-    func userDidTapOnFailIcon(viewModel viewModel: DemoTextMessageViewModel) {
+    func userDidTapOnFailIcon(viewModel viewModel: DemoTextMessageViewModel, failIconView: UIView) {
         self.baseHandler.userDidTapOnFailIcon(viewModel: viewModel)
     }