diff --git a/CHANGES.rst b/CHANGES.rst
index 922eb3283..0f8ec2071 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,12 +2,14 @@ Changes in 0.7.0 ()
 ===============================================
 
 Improvements:
+* RoomVC: Add "view decrypted source" option on the selected event (#1642).
+* RoomVC: Implement replies sending (#1911).
+* Support room versioning (#1938).
+* Add support of lazy-loading of room members (#1931) (disabled for now).
+* i18n: Add Traditional Chinese (zh_Hant).
+* i18n: Add Albanian (sq).
 * Update project structure. Organize UI related files by feature (PR#1932).
 * Move image files to xcassets (PR#1932).
-* Replies: Implement sending (#1911).
-* Support room versioning (#1938).
-* Add support of lazy-loading of room members (#1931).
-* Chat screen: Add "view decrypted source" option on the selected event (#1642).
 
 Changes in 0.6.20 (2018-07-13)
 ===============================================
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index b11906822..7dfadf331 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -117,8 +117,8 @@ enum
 
 enum
 {
-    LABS_USE_ROOM_MEMBERS_LAZY_LOADING_INDEX = 0,
-    LABS_USE_JITSI_WIDGET_INDEX,
+    //LABS_USE_ROOM_MEMBERS_LAZY_LOADING_INDEX = 0,
+    LABS_USE_JITSI_WIDGET_INDEX = 0,
     LABS_CRYPTO_INDEX,
     LABS_COUNT
 };
@@ -2041,7 +2041,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
     }
     else if (section == SETTINGS_SECTION_LABS_INDEX)
     {
-        if (row == LABS_USE_ROOM_MEMBERS_LAZY_LOADING_INDEX)
+        /*if (row == LABS_USE_ROOM_MEMBERS_LAZY_LOADING_INDEX)
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
 
@@ -2052,7 +2052,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
 
             cell = labelAndSwitchCell;
         }
-        else if (row == LABS_USE_JITSI_WIDGET_INDEX)
+        else*/ if (row == LABS_USE_JITSI_WIDGET_INDEX)
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];