diff --git a/Riot/ViewController/RoomViewController.m b/Riot/ViewController/RoomViewController.m
index 22f174422..83efa0de1 100644
--- a/Riot/ViewController/RoomViewController.m
+++ b/Riot/ViewController/RoomViewController.m
@@ -1750,6 +1750,10 @@
             MXKReceiptSendersContainer *container = userInfo[kMXKRoomBubbleCellReceiptsContainerKey];
             [ReadReceiptsViewController openInViewController:self fromContainer:container withSession:self.mainSession];
         }
+        else if ([actionIdentifier isEqualToString:kRoomMembershipExpandedBubbleCellTapOnCollapseButton])
+        {
+            [self.roomDataSource collapseRoomBubble:((MXKRoomBubbleTableViewCell*)cell).bubbleData collapsed:YES];
+        }
         else
         {
             // Keep default implementation for other actions
diff --git a/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.h b/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.h
index 728fa75c9..cba3eb8d8 100644
--- a/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.h
+++ b/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.h
@@ -16,6 +16,11 @@
 
 #import "RoomMembershipBubbleCell.h"
 
+/**
+ Action identifier used when the user tapped on the "collapse" button.
+ */
+extern NSString *const kRoomMembershipExpandedBubbleCellTapOnCollapseButton;
+
 /**
  `RoomMembershipExpandedBubbleCell` displays the first membership event of serie
  that can be collapsable.
diff --git a/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.m b/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.m
index 838d79f35..eb702ce76 100644
--- a/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.m
+++ b/Riot/Views/RoomBubbleList/RoomMembershipExpandedBubbleCell.m
@@ -20,6 +20,8 @@
 
 #import "RoomBubbleCellData.h"
 
+NSString *const kRoomMembershipExpandedBubbleCellTapOnCollapseButton = @"kRoomMembershipExpandedBubbleCellTapOnCollapseButton";
+
 @implementation RoomMembershipExpandedBubbleCell
 
 - (void)awakeFromNib
@@ -37,8 +39,10 @@
 
 - (IBAction)onCollapseButtonTap:(id)sender
 {
-    [((MXKRoomBubbleCellData*)self.bubbleData).roomDataSource collapseRoomBubble:self.bubbleData collapsed:YES];
-    
+    if (self.delegate)
+    {
+        [self.delegate cell:self didRecognizeAction:kRoomMembershipExpandedBubbleCellTapOnCollapseButton userInfo:nil];
+    }
 }
 
 @end