diff --git a/Riot/Modules/Common/Recents/RecentsViewController.h b/Riot/Modules/Common/Recents/RecentsViewController.h
index 70a504c8b..d3968cfd6 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.h
+++ b/Riot/Modules/Common/Recents/RecentsViewController.h
@@ -160,6 +160,11 @@
  */
 - (void)makeDirectEditedRoom:(BOOL)isDirect;
 
+/**
+Enable/disable the notifications for the selected room.
+*/
+- (void)muteEditedRoomNotifications:(BOOL)mute;
+
 /**
  Edit notification settings for the selected room.
  */
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index 3cfe7b938..e76a83cab 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -1033,12 +1033,31 @@
     UIContextualAction *muteAction = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive
                                                                              title:title
                                                                            handler:^(UIContextualAction * _Nonnull action, __kindof UIView * _Nonnull sourceView, void (^ _Nonnull completionHandler)(BOOL)) {
-        [self changeEditedRoomNotificationSettings];
+        
+        if ([BuildSettings roomSettingsScreenShowNotificationsV2])
+        {
+            [self changeEditedRoomNotificationSettings];
+        }
+        else
+        {
+            [self muteEditedRoomNotifications:!isMuted];
+        }
+        
+        
         completionHandler(YES);
     }];
     muteAction.backgroundColor = actionBackgroundColor;
     
-    UIImage *notificationImage = isMuted ? [UIImage imageNamed:@"room_action_notification_muted"] : [UIImage imageNamed:@"room_action_notification"];
+    UIImage *notificationImage;
+    if([BuildSettings roomSettingsScreenShowNotificationsV2])
+    {
+        notificationImage = isMuted ? [UIImage imageNamed:@"room_action_notification_muted"] : [UIImage imageNamed:@"room_action_notification"];
+    }
+    else
+    {
+        notificationImage = [UIImage imageNamed:@"room_action_notification"];
+    }
+
     notificationImage = [notificationImage vc_tintedImageUsingColor:isMuted ? unselectedColor : selectedColor];
     muteAction.image = [notificationImage vc_notRenderedImage];
     
@@ -1317,6 +1336,47 @@
     }
 }
 
+- (void)muteEditedRoomNotifications:(BOOL)mute
+{
+    if (editedRoomId)
+    {
+        // Check whether the user didn't leave the room
+        MXRoom *room = [self.mainSession roomWithRoomId:editedRoomId];
+        if (room)
+        {
+            [self startActivityIndicator];
+
+            if (mute)
+            {
+                [room mentionsOnly:^{
+
+                    [self stopActivityIndicator];
+
+                    // Leave editing mode
+                    [self cancelEditionMode:self->isRefreshPending];
+
+                }];
+            }
+            else
+            {
+                [room allMessages:^{
+
+                    [self stopActivityIndicator];
+
+                    // Leave editing mode
+                    [self cancelEditionMode:self->isRefreshPending];
+
+                }];
+            }
+        }
+        else
+        {
+            // Leave editing mode
+            [self cancelEditionMode:isRefreshPending];
+        }
+    }
+}
+
 #pragma mark - UITableView delegate
 
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m
index 3f872cf2d..74fef7d37 100644
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@@ -347,7 +347,15 @@
             
             tableViewCell.notificationsButton.tag = room.isMute || room.isMentionsOnly;
             [tableViewCell.notificationsButton addTarget:self action:@selector(onNotificationsButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
-            tableViewCell.notificationsImageView.image = tableViewCell.notificationsButton.tag ? [UIImage imageNamed:@"room_action_notification_muted"] : [UIImage imageNamed:@"room_action_notification"];
+            
+            if ([BuildSettings roomSettingsScreenShowNotificationsV2])
+            {
+                tableViewCell.notificationsImageView.image = tableViewCell.notificationsButton.tag ? [UIImage imageNamed:@"room_action_notification_muted"] : [UIImage imageNamed:@"room_action_notification"];
+            }
+            else
+            {
+                tableViewCell.notificationsImageView.image = [UIImage imageNamed:@"room_action_notification"];
+            }
             
             tableViewCell.notificationsImageView.tintColor = tableViewCell.notificationsButton.tag ? unselectedColor : selectedColor;
             
@@ -664,7 +672,15 @@
         MXRoom *room = [self.mainSession roomWithRoomId:editedRoomId];
         if (room)
         {
-            [self changeEditedRoomNotificationSettings];
+            if ([BuildSettings roomSettingsScreenShowNotificationsV2])
+            {
+                [self changeEditedRoomNotificationSettings];
+            }
+            else
+            {
+                UIButton *button = (UIButton*)sender;
+                [self muteEditedRoomNotifications:!button.tag];
+            }
         }
     }
 }