diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 01ff29aec..d0d2d4147 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -166,7 +166,6 @@ typedef NS_ENUM(NSUInteger, LABS_ENABLE)
 {
     LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX = 0,
     LABS_ENABLE_THREADS_INDEX,
-    LABS_ENABLE_MESSAGE_BUBBLES_INDEX,
     LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS,
     LABS_USE_ONLY_LATEST_USER_AVATAR_AND_NAME_INDEX,
     LABS_ENABLE_LIVE_LOCATION_SHARING
@@ -515,9 +514,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
     
     if (BuildSettings.roomScreenAllowTimelineStyleConfiguration)
     {
-        // NOTE: Message bubbles are under labs section atm
-        
-//        [sectionUserInterface addRowWithTag:USER_INTERFACE_TIMELINE_STYLE_INDEX];
+        [sectionUserInterface addRowWithTag:USER_INTERFACE_TIMELINE_STYLE_INDEX];
     }
 
     [sectionUserInterface addRowWithTag:USER_INTERFACE_SHOW_REDACTIONS_IN_ROOM_HISTORY];
@@ -587,7 +584,6 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
         Section *sectionLabs = [Section sectionWithTag:SECTION_TAG_LABS];
         [sectionLabs addRowWithTag:LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX];
         [sectionLabs addRowWithTag:LABS_ENABLE_THREADS_INDEX];
-        [sectionLabs addRowWithTag:LABS_ENABLE_MESSAGE_BUBBLES_INDEX];
         [sectionLabs addRowWithTag:LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS];
         [sectionLabs addRowWithTag:LABS_USE_ONLY_LATEST_USER_AVATAR_AND_NAME_INDEX];
         if (BuildSettings.liveLocationSharingEnabled)
@@ -2527,10 +2523,6 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
             
             cell = labelAndSwitchCell;
         }
-        else if (row == LABS_ENABLE_MESSAGE_BUBBLES_INDEX)
-        {
-            cell = [self buildMessageBubblesCellForTableView:tableView atIndexPath:indexPath];
-        }
         else if (row == LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS)
         {
             cell = [self buildAutoReportDecryptionErrorsCellForTableView:tableView atIndexPath:indexPath];
diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
index a39607ad7..c25174dab 100644
--- a/Riot/Utils/EventFormatter.m
+++ b/Riot/Utils/EventFormatter.m
@@ -139,6 +139,11 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
 {
     if (event.isRedactedEvent)
     {
+        if (event.eventType == MXEventTypeReaction)
+        {
+            //  do not show redacted reactions in the timeline
+            return nil;
+        }
         // Check whether the event is a thread root or redacted information is required
         if ((RiotSettings.shared.enableThreads && [mxSession.threadingService isEventThreadRoot:event])
             || self.settings.showRedactionsInRoomHistory)
diff --git a/Riot/Utils/UniversalLink.m b/Riot/Utils/UniversalLink.m
index 32ce62dd4..edd73c7b8 100644
--- a/Riot/Utils/UniversalLink.m
+++ b/Riot/Utils/UniversalLink.m
@@ -46,7 +46,7 @@
     NSArray<NSString*> *fragments = [_url.fragment componentsSeparatedByString:@"?"];
 
     // Extract path params
-    pathParams = [fragments[0] componentsSeparatedByString:@"/"];
+    pathParams = [[fragments[0] stringByRemovingPercentEncoding] componentsSeparatedByString:@"/"];
 
     // Remove the first empty path param string
     pathParams = [pathParams filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"length > 0"]];
diff --git a/changelog.d/6207.bugfix b/changelog.d/6207.bugfix
new file mode 100644
index 000000000..db390d4ed
--- /dev/null
+++ b/changelog.d/6207.bugfix
@@ -0,0 +1 @@
+Universal Link: Url decode url fragment before splitting up.
diff --git a/changelog.d/6293.bugfix b/changelog.d/6293.bugfix
new file mode 100644
index 000000000..1d8e1247c
--- /dev/null
+++ b/changelog.d/6293.bugfix
@@ -0,0 +1 @@
+Room: Do not show redacted reactions in the timeline.
diff --git a/changelog.d/pr-6285.change b/changelog.d/pr-6285.change
new file mode 100644
index 000000000..de8f46912
--- /dev/null
+++ b/changelog.d/pr-6285.change
@@ -0,0 +1 @@
+De-labs message bubbles