diff --git a/dev/App/User.jsx b/dev/App/User.jsx
index 260b855b5..b3accdfbe 100644
--- a/dev/App/User.jsx
+++ b/dev/App/User.jsx
@@ -25,7 +25,7 @@ import PgpStore from 'Stores/User/Pgp';
 import MessageStore from 'Stores/User/Message';
 import ContactStore from 'Stores/User/Contact';
 
-import Local from 'Storage/Client.jsx';
+import Local from 'Storage/Client';
 import Settings from 'Storage/Settings';
 
 import Remote from 'Remote/User/Ajax';
diff --git a/dev/Common/ClientStorageDriver/Cookie.jsx b/dev/Common/ClientStorageDriver/Cookie.jsx
index 631fcebf6..106021758 100644
--- a/dev/Common/ClientStorageDriver/Cookie.jsx
+++ b/dev/Common/ClientStorageDriver/Cookie.jsx
@@ -12,7 +12,7 @@ class CookieDriver
 	 */
 	set(key, data) {
 
-		let 
+		let
 			result = false,
 			storageResult = null
 		;
@@ -46,10 +46,10 @@ class CookieDriver
 	get(sKey) {
 
 		let result = null;
-		
+
 		try
 		{
-			const 
+			const
 				storageValue = $.cookie(CLIENT_SIDE_STORAGE_INDEX_NAME),
 				storageResult = null === storageValue ? null : JSON.parse(storageValue)
 			;
diff --git a/dev/Promises/User/Populator.js b/dev/Promises/User/Populator.js
index b7d78839c..5771d1911 100644
--- a/dev/Promises/User/Populator.js
+++ b/dev/Promises/User/Populator.js
@@ -15,7 +15,7 @@
 		FolderStore = require('Stores/User/Folder'),
 
 		Settings = require('Storage/Settings'),
-		Local = require('Storage/Client.jsx'),
+		Local = require('Storage/Client'),
 
 		FolderModel = require('Model/Folder'),
 
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index 8d59547dc..a584c5d69 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -13,7 +13,7 @@
 		Cache = require('Common/Cache'),
 
 		Settings = require('Storage/Settings'),
-		Local = require('Storage/Client.jsx'),
+		Local = require('Storage/Client'),
 
 		FolderStore = require('Stores/User/Folder'),
 
diff --git a/dev/Storage/Client.jsx b/dev/Storage/Client.jsx
index eacb100d8..719dabec0 100644
--- a/dev/Storage/Client.jsx
+++ b/dev/Storage/Client.jsx
@@ -1,12 +1,12 @@
 
 import {_} from 'common';
-import {Cookie} from 'Common/ClientStorageDriver/Cookie';
-import {LocalStorage} from 'Common/ClientStorageDriver/LocalStorage';
+import {CookieDriver} from 'Common/ClientStorageDriver/Cookie';
+import {LocalStorageDriver} from 'Common/ClientStorageDriver/LocalStorage';
 
 class ClientStorage
 {
 	constructor() {
-		const SupportedStorageDriver = _.find([LocalStorage, Cookie],
+		const SupportedStorageDriver = _.find([LocalStorageDriver, CookieDriver],
 			(StorageDriver) => StorageDriver && StorageDriver.supported());
 		this.driver = SupportedStorageDriver ? new SupportedStorageDriver() : null;
 	}
diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
index 3c267e397..a46693a95 100644
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@@ -19,7 +19,7 @@
 		LanguageStore = require('Stores/Language'),
 		AppStore = require('Stores/User/App'),
 
-		Local = require('Storage/Client.jsx'),
+		Local = require('Storage/Client'),
 		Settings = require('Storage/Settings'),
 
 		Remote = require('Remote/User/Ajax'),
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index a964cf509..e0dc77fcf 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -28,7 +28,7 @@
 		FolderStore = require('Stores/User/Folder'),
 		MessageStore = require('Stores/User/Message'),
 
-		Local = require('Storage/Client.jsx'),
+		Local = require('Storage/Client'),
 		Settings = require('Storage/Settings'),
 		Remote = require('Remote/User/Ajax'),
 
diff --git a/package.json b/package.json
index 3c9a96468..625d2706e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "RainLoop",
   "title": "RainLoop Webmail",
   "version": "1.9.4",
-  "release": "394",
+  "release": "395",
   "description": "Simple, modern & fast web-based email client",
   "homepage": "http://rainloop.net",
   "main": "gulpfile.js",