diff --git a/CHANGES.rst b/CHANGES.rst
index 0c1ca38be..822cf6e91 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,13 +2,19 @@ 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).
-* Improve GDPR consent webview management (#1952)
+* Improve GDPR consent webview management (#1952).
 
 Changes in 0.6.20 (2018-07-13)
 ===============================================
diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj
index 8b21896d1..c13b8c2bd 100644
--- a/Riot.xcodeproj/project.pbxproj
+++ b/Riot.xcodeproj/project.pbxproj
@@ -387,6 +387,12 @@
 		3267EFB520E379FD00FF1CAA /* AUTHORS.rst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS.rst; sourceTree = "<group>"; };
 		3267EFB620E379FD00FF1CAA /* README.rst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.rst; sourceTree = "<group>"; };
 		3284A35020A07C210044F922 /* postMessageAPI.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = postMessageAPI.js; sourceTree = "<group>"; };
+		32BDC9A1211C2C870064AF51 /* zh_Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_Hant; path = zh_Hant.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		32BDC9A2211C2C870064AF51 /* zh_Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_Hant; path = zh_Hant.lproj/Localizable.strings; sourceTree = "<group>"; };
+		32BDC9A3211C2C870064AF51 /* zh_Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_Hant; path = zh_Hant.lproj/Vector.strings; sourceTree = "<group>"; };
+		32BDC9A4211C34C90064AF51 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		32BDC9A5211C34C90064AF51 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/Localizable.strings; sourceTree = "<group>"; };
+		32BDC9A6211C34C90064AF51 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/Vector.strings; sourceTree = "<group>"; };
 		33F966BE1A83B32A2DFE24CA /* Pods-RiotPods-SiriIntents.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RiotPods-SiriIntents.release.xcconfig"; path = "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.release.xcconfig"; sourceTree = "<group>"; };
 		397BCA987893439918EBF330 /* Pods-SiriIntents.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SiriIntents.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SiriIntents/Pods-SiriIntents.debug.xcconfig"; sourceTree = "<group>"; };
 		4D1164C2F07EF74950DCDA7A /* Pods-SiriIntents.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SiriIntents.release.xcconfig"; path = "Pods/Target Support Files/Pods-SiriIntents/Pods-SiriIntents.release.xcconfig"; sourceTree = "<group>"; };
@@ -2669,6 +2675,8 @@
 				ca,
 				bg,
 				is,
+				zh_Hant,
+				sq,
 			);
 			mainGroup = F094A9991B78D8F000B1FBBF;
 			productRefGroup = F094A9A31B78D8F000B1FBBF /* Products */;
@@ -3190,6 +3198,8 @@
 				B1664D8820F4EBF700808783 /* fr */,
 				B1664D8A20F4EBF800808783 /* ru */,
 				B1664D8B20F4EBF800808783 /* zh_Hans */,
+				32BDC9A3211C2C870064AF51 /* zh_Hant */,
+				32BDC9A6211C34C90064AF51 /* sq */,
 			);
 			name = Vector.strings;
 			sourceTree = "<group>";
@@ -3207,6 +3217,8 @@
 				B1664D8320F4EBF600808783 /* fr */,
 				B1664D8520F4EBF700808783 /* zh_Hans */,
 				B1664D8920F4EBF700808783 /* ru */,
+				32BDC9A1211C2C870064AF51 /* zh_Hant */,
+				32BDC9A4211C34C90064AF51 /* sq */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -3224,6 +3236,8 @@
 				B1664D8C20F4EBF800808783 /* fr */,
 				B1664D8D20F4EBF800808783 /* vi */,
 				B1664D8E20F4EBF900808783 /* ca */,
+				32BDC9A2211C2C870064AF51 /* zh_Hant */,
+				32BDC9A5211C34C90064AF51 /* sq */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
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];