diff --git a/Vector/AppDelegate.m b/Vector/AppDelegate.m
index 1a5dcec98..68f4d4a09 100644
--- a/Vector/AppDelegate.m
+++ b/Vector/AppDelegate.m
@@ -188,7 +188,7 @@
     
     // Override point for customization after application launch.
     
-    // define the navigation bar text color
+    // Define the navigation bar text color
     [[UINavigationBar appearance] setTintColor:kVectorColorGreen];
     
     // Customize the localized string table
@@ -642,6 +642,9 @@
     // Disable identicon use
     [MXSDKOptions sharedInstance].disableIdenticonUseForUserAvatar = YES;
     
+    // Disable long press on event in bubble cells
+    [MXKRoomBubbleTableViewCell disableLongPressGestureOnEvent:YES];
+    
     // Set first RoomDataSource class used in Vector
     [MXKRoomDataSourceManager registerRoomDataSourceClass:RoomDataSource.class];
     
diff --git a/Vector/ViewController/RoomViewController.m b/Vector/ViewController/RoomViewController.m
index ca5b3f53b..f498acb97 100644
--- a/Vector/ViewController/RoomViewController.m
+++ b/Vector/ViewController/RoomViewController.m
@@ -869,10 +869,6 @@
                 }
             }
         }
-        else if ([actionIdentifier isEqualToString:kMXKRoomBubbleCellLongPressOnEvent])
-        {
-            // Disable default behavior
-        }
         else
         {
             // Keep default implementation for other actions