diff --git a/jslib b/jslib
index d75543e6c8..1aa774b99f 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit d75543e6c88b220d8e3c7d66fb768d39f9480587
+Subproject commit 1aa774b99f73123b0bcf2654e4ba59fe95f39563
diff --git a/src/bw.ts b/src/bw.ts
index cc78402138..5ef3702e53 100644
--- a/src/bw.ts
+++ b/src/bw.ts
@@ -88,8 +88,8 @@ export class Main {
         this.settingsService = new SettingsService(this.userService, this.storageService);
         this.cipherService = new CipherService(this.cryptoService, this.userService, this.settingsService,
             this.apiService, this.storageService, this.i18nService, this.platformUtilsService);
-        this.folderService = new FolderService(this.cryptoService, this.userService,
-            () => 'No Folder', this.apiService, this.storageService, this.i18nService);
+        this.folderService = new FolderService(this.cryptoService, this.userService, this.apiService,
+            this.storageService, this.i18nService, this.cipherService);
         this.collectionService = new CollectionService(this.cryptoService, this.userService, this.storageService,
             this.i18nService);
         this.lockService = new LockService(this.cipherService, this.folderService, this.collectionService,
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 880c57feb9..f5e8edc80f 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -10,5 +10,8 @@
   },
   "emailTitle": {
     "message": "Email"
+  },
+  "noneFolder": {
+    "message": "No Folder"
   }
 }