Code refactoring

dev/App/Admin.js

@@ -21,7 +21,7 @@
 		LicenseStore = require('Stores/Admin/License'),
 		PackageStore = require('Stores/Admin/Package'),
 		CoreStore = require('Stores/Admin/Core'),
-		Remote = require('Storage/Admin/Remote'),
+		Remote = require('Remote/Admin/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractApp = require('App/Abstract')

dev/App/User.js

@@ -21,6 +21,8 @@
 
 		kn = require('Knoin/Knoin'),
 
+		Cache = require('Common/Cache'),
+
 		SocialStore = require('Stores/Social'),
 		AppStore = require('Stores/User/App'),
 		SettingsStore = require('Stores/User/Settings'),
@@ -34,8 +36,8 @@
 
 		Local = require('Storage/Client'),
 		Settings = require('Storage/Settings'),
-		Cache = require('Storage/User/Cache'),
+
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		EmailModel = require('Model/Email'),
 		FolderModel = require('Model/Folder'),

dev/Model/Filter.js

@@ -11,7 +11,7 @@
 		Utils = require('Common/Utils'),
 		Translator = require('Common/Translator'),
 
-		Cache = require('Storage/User/Cache'),
+		Cache = require('Common/Cache'),
 
 		FilterConditionModel = require('Model/FilterCondition'),
 

dev/Model/Folder.js

@@ -12,7 +12,7 @@
 		Events = require('Common/Events'),
 		Translator = require('Common/Translator'),
 
-		Cache = require('Storage/User/Cache'),
+		Cache = require('Common/Cache'),
 
 		AbstractModel = require('Knoin/AbstractModel')
 	;

dev/Remote/AbstractAjax.js

@@ -21,12 +21,12 @@
 	/**
 	* @constructor
 	*/
-	function AbstractRemoteStorage()
+	function AbstractAjaxRemote()
 	{
 		this.oRequests = {};
 	}
 
-	AbstractRemoteStorage.prototype.oRequests = {};
+	AbstractAjaxRemote.prototype.oRequests = {};
 
 	/**
 	 * @param {?Function} fCallback
@@ -36,7 +36,7 @@
 	 * @param {boolean} bCached
 	 * @param {*=} oRequestParameters
 	 */
-	AbstractRemoteStorage.prototype.defaultResponse = function (fCallback, sRequestAction, sType, oData, bCached, oRequestParameters)
+	AbstractAjaxRemote.prototype.defaultResponse = function (fCallback, sRequestAction, sType, oData, bCached, oRequestParameters)
 	{
 		var
 			fCall = function () {
@@ -134,7 +134,7 @@
 	 * @param {Array=} aAbortActions = []
 	 * @return {jQuery.jqXHR}
 	 */
-	AbstractRemoteStorage.prototype.ajaxRequest = function (fResultCallback, oParameters, iTimeOut, sGetAdd, aAbortActions)
+	AbstractAjaxRemote.prototype.ajaxRequest = function (fResultCallback, oParameters, iTimeOut, sGetAdd, aAbortActions)
 	{
 		var
 			self = this,
@@ -230,7 +230,7 @@
 	 * @param {string=} sGetAdd = ''
 	 * @param {Array=} aAbortActions = []
 	 */
-	AbstractRemoteStorage.prototype.defaultRequest = function (fCallback, sAction, oParameters, iTimeout, sGetAdd, aAbortActions)
+	AbstractAjaxRemote.prototype.defaultRequest = function (fCallback, sAction, oParameters, iTimeout, sGetAdd, aAbortActions)
 	{
 		oParameters = oParameters || {};
 		oParameters.Action = sAction;
@@ -246,7 +246,7 @@
 	/**
 	 * @param {?Function} fCallback
 	 */
-	AbstractRemoteStorage.prototype.noop = function (fCallback)
+	AbstractAjaxRemote.prototype.noop = function (fCallback)
 	{
 		this.defaultRequest(fCallback, 'Noop');
 	};
@@ -260,7 +260,7 @@
 	 * @param {string} sHtmlCapa
 	 * @param {number} iTime
 	 */
-	AbstractRemoteStorage.prototype.jsError = function (fCallback, sMessage, sFileName, iLineNo, sLocation, sHtmlCapa, iTime)
+	AbstractAjaxRemote.prototype.jsError = function (fCallback, sMessage, sFileName, iLineNo, sLocation, sHtmlCapa, iTime)
 	{
 		this.defaultRequest(fCallback, 'JsError', {
 			'Message': sMessage,
@@ -278,7 +278,7 @@
 	 * @param {Array=} mData = null
 	 * @param {boolean=} bIsError = false
 	 */
-	AbstractRemoteStorage.prototype.jsInfo = function (fCallback, sType, mData, bIsError)
+	AbstractAjaxRemote.prototype.jsInfo = function (fCallback, sType, mData, bIsError)
 	{
 		this.defaultRequest(fCallback, 'JsInfo', {
 			'Type': sType,
@@ -290,7 +290,7 @@
 	/**
 	 * @param {?Function} fCallback
 	 */
-	AbstractRemoteStorage.prototype.getPublicKey = function (fCallback)
+	AbstractAjaxRemote.prototype.getPublicKey = function (fCallback)
 	{
 		this.defaultRequest(fCallback, 'GetPublicKey');
 	};
@@ -299,13 +299,13 @@
 	 * @param {?Function} fCallback
 	 * @param {string} sVersion
 	 */
-	AbstractRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
+	AbstractAjaxRemote.prototype.jsVersion = function (fCallback, sVersion)
 	{
 		this.defaultRequest(fCallback, 'Version', {
 			'Version': sVersion
 		});
 	};
 
-	module.exports = AbstractRemoteStorage;
+	module.exports = AbstractAjaxRemote;
 
 }());

dev/Remote/Admin/Ajax.js

@@ -6,21 +6,21 @@
 	var
 		_ = require('_'),
 
-		AbstractRemoteStorage = require('Storage/AbstractRemote')
+		AbstractAjaxRemote = require('Remote/AbstractAjax')
 	;
 
 	/**
 	 * @constructor
-	 * @extends AbstractRemoteStorage
+	 * @extends AbstractAjaxRemote
 	 */
 	function RemoteAdminStorage()
 	{
-		AbstractRemoteStorage.call(this);
+		AbstractAjaxRemote.call(this);
 
 		this.oRequests = {};
 	}
 
-	_.extend(RemoteAdminStorage.prototype, AbstractRemoteStorage.prototype);
+	_.extend(RemoteAdminStorage.prototype, AbstractAjaxRemote.prototype);
 
 	/**
 	 * @param {?Function} fCallback

dev/Remote/User/Ajax.js

@@ -10,14 +10,15 @@
 		Consts = require('Common/Consts'),
 		Base64 = require('Common/Base64'),
 
+		Cache = require('Common/Cache'),
+
+		Settings = require('Storage/Settings'),
+
 		AppStore = require('Stores/User/App'),
 		SettingsStore = require('Stores/User/Settings'),
 		MessageStore = require('Stores/User/Message'),
 
-		Settings = require('Storage/Settings'),
+		AbstractAjaxRemote = require('Remote/AbstractAjax')
-		Cache = require('Storage/User/Cache'),
-
-		AbstractRemoteStorage = require('Storage/AbstractRemote')
 	;
 
 	/**
@@ -26,14 +27,14 @@
 	 */
 	function RemoteUserStorage()
 	{
-		AbstractRemoteStorage.call(this);
+		AbstractAjaxRemote.call(this);
 
 		this.oRequests = {};
 
 		this.sSubSubQuery = '&ss=/';
 	}
 
-	_.extend(RemoteUserStorage.prototype, AbstractRemoteStorage.prototype);
+	_.extend(RemoteUserStorage.prototype, AbstractAjaxRemote.prototype);
 
 	/**
 	 * @param {?Function} fCallback
@@ -619,12 +620,13 @@
 	 * @param {(Array|null)} aDraftInfo
 	 * @param {string} sInReplyTo
 	 * @param {string} sReferences
+	 * @param {boolean} bRequestDsn
 	 * @param {boolean} bRequestReadReceipt
 	 * @param {boolean} bMarkAsImportant
 	 */
 	RemoteUserStorage.prototype.sendMessage = function (fCallback, sIdentityID, sMessageFolder, sMessageUid, sSentFolder,
 		sTo, sCc, sBcc, sReplyTo, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences,
-		bRequestReadReceipt, bMarkAsImportant)
+		bRequestDsn, bRequestReadReceipt, bMarkAsImportant)
 	{
 		this.defaultRequest(fCallback, 'SendMessage', {
 			'IdentityID': sIdentityID,
@@ -641,6 +643,7 @@
 			'DraftInfo': aDraftInfo,
 			'InReplyTo': sInReplyTo,
 			'References': sReferences,
+			'Dsn': bRequestDsn ? '1' : '0',
 			'ReadReceiptRequest': bRequestReadReceipt ? '1' : '0',
 			'MarkAsImportant': bMarkAsImportant ? '1' : '0',
 			'Attachments': aAttachments

dev/Screen/User/MailBox.js

@@ -12,13 +12,13 @@
 		Events = require('Common/Events'),
 		Translator = require('Common/Translator'),
 
+		Cache = require('Common/Cache'),
+
 		AccountStore = require('Stores/User/Account'),
 		SettingsStore = require('Stores/User/Settings'),
 		FolderStore = require('Stores/User/Folder'),
 		MessageStore = require('Stores/User/Message'),
 
-		Cache = require('Storage/User/Cache'),
-
 		AbstractScreen = require('Knoin/AbstractScreen')
 	;
 

dev/Settings/Admin/Branding.js

@@ -56,7 +56,7 @@
 		{
 			var
 				self = this,
-				Remote = require('Storage/Admin/Remote')
+				Remote = require('Remote/Admin/Ajax')
 			;
 
 			_.delay(function () {

dev/Settings/Admin/Contacts.js

@@ -19,7 +19,7 @@
 	function ContactsAdminSettings()
 	{
 		var
-			Remote = require('Storage/Admin/Remote')
+			Remote = require('Remote/Admin/Ajax')
 		;
 
 		this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
@@ -178,7 +178,7 @@
 	{
 		var
 			self = this,
-			Remote = require('Storage/Admin/Remote')
+			Remote = require('Remote/Admin/Ajax')
 		;
 
 		_.delay(function () {

dev/Settings/Admin/Domains.js

@@ -10,7 +10,7 @@
 		Enums = require('Common/Enums'),
 
 		DomainStore = require('Stores/Admin/Domain'),
-		Remote = require('Storage/Admin/Remote')
+		Remote = require('Remote/Admin/Ajax')
 	;
 
 	/**

dev/Settings/Admin/General.js

@@ -68,7 +68,7 @@
 	{
 		var
 			self = this,
-			Remote = require('Storage/Admin/Remote')
+			Remote = require('Remote/Admin/Ajax')
 		;
 
 		_.delay(function () {

dev/Settings/Admin/Login.js

@@ -35,7 +35,7 @@
 	{
 		var
 			self = this,
-			Remote = require('Storage/Admin/Remote')
+			Remote = require('Remote/Admin/Ajax')
 		;
 
 		_.delay(function () {

dev/Settings/Admin/Packages.js

@@ -12,7 +12,7 @@
 		Translator = require('Common/Translator'),
 
 		PackageStore = require('Stores/Admin/Package'),
-		Remote = require('Storage/Admin/Remote')
+		Remote = require('Remote/Admin/Ajax')
 	;
 
 	/**

dev/Settings/Admin/Plugins.js

@@ -13,7 +13,7 @@
 
 		Settings = require('Storage/Settings'),
 		PluginStore = require('Stores/Admin/Plugin'),
-		Remote = require('Storage/Admin/Remote')
+		Remote = require('Remote/Admin/Ajax')
 	;
 
 	/**

dev/Settings/Admin/Security.js

@@ -15,7 +15,7 @@
 		CapaAdminStore = require('Stores/Admin/Capa'),
 
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/Admin/Remote')
+		Remote = require('Remote/Admin/Ajax')
 	;
 
 	/**
@@ -114,10 +114,6 @@
 
 	SecurityAdminSettings.prototype.onBuild = function ()
 	{
-		var
-			Remote = require('Storage/Admin/Remote')
-		;
-
 		this.capaOpenPGP.subscribe(function (bValue) {
 			Remote.saveAdminConfig(Utils.emptyFunction, {
 				'CapaOpenPGP': bValue ? '1' : '0'

dev/Settings/Admin/Social.js

@@ -59,7 +59,7 @@
 	{
 		var
 			self = this,
-			Remote = require('Storage/Admin/Remote')
+			Remote = require('Remote/Admin/Ajax')
 		;
 
 		_.delay(function () {

dev/Settings/User/Accounts.js

@@ -15,7 +15,7 @@
 		IdentityStore = require('Stores/User/Identity'),
 
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/User/Remote')
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/ChangePassword.js

@@ -11,7 +11,7 @@
 		Utils = require('Common/Utils'),
 		Translator = require('Common/Translator'),
 
-		Remote = require('Storage/User/Remote')
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/Contacts.js

@@ -9,7 +9,7 @@
 		AppStore = require('Stores/User/App'),
 		ContactStore = require('Stores/User/Contact'),
 
-		Remote = require('Storage/User/Remote')
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/Filters.js

@@ -13,7 +13,7 @@
 
 		FilterStore = require('Stores/User/Filter'),
 
-		Remote = require('Storage/User/Remote')
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/Folders.js

@@ -10,12 +10,14 @@
 		Utils = require('Common/Utils'),
 		Translator = require('Common/Translator'),
 
-		FolderStore = require('Stores/User/Folder'),
+		Cache = require('Common/Cache'),
 
 		Settings = require('Storage/Settings'),
-		Cache = require('Storage/User/Cache'),
+		Local = require('Storage/Client'),
-		Remote = require('Storage/User/Remote'),
+
-		Local = require('Storage/Client')
+		FolderStore = require('Stores/User/Folder'),
+
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/General.js

@@ -19,7 +19,7 @@
 		NotificationStore = require('Stores/User/Notification'),
 		MessageStore = require('Stores/User/Message'),
 
-		Remote = require('Storage/User/Remote')
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/Security.js

@@ -15,7 +15,7 @@
 
 		Settings = require('Storage/Settings'),
 
-		Remote = require('Storage/User/Remote')
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/Templates.js

@@ -10,7 +10,7 @@
 
 		TemplateStore = require('Stores/User/Template'),
 
-		Remote = require('Storage/User/Remote')
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Settings/User/Themes.js

@@ -18,7 +18,8 @@
 		ThemeStore = require('Stores/Theme'),
 
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/User/Remote')
+		
+		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/Storage/User/Data.js

@@ -1,16 +0,0 @@
-
-(function () {
-
-	'use strict';
-
-	/**
-	 * @constructor
-	 */
-	function DataUserStorage()
-	{
-
-	}
-
-	module.exports = new DataUserStorage();
-
-}());

dev/Stores/User/Folder.js

@@ -13,7 +13,7 @@
 		Globals = require('Common/Globals'),
 		Utils = require('Common/Utils'),
 
-		Cache = require('Storage/User/Cache')
+		Cache = require('Common/Cache')
 	;
 
 	/**

dev/Stores/User/Message.js

@@ -19,12 +19,12 @@
 		Links = require('Common/Links'),
 		Translator = require('Common/Translator'),
 
+		Cache = require('Common/Cache'),
+
 		FolderStore = require('Stores/User/Folder'),
 		SettingsStore = require('Stores/User/Settings'),
 
-		MessageModel = require('Model/Message'),
+		MessageModel = require('Model/Message')
-
-		Cache = require('Storage/User/Cache')
 	;
 
 	/**

dev/Stores/User/Template.js

@@ -7,7 +7,7 @@
 		_ = require('_'),
 		ko = require('ko')
 
-//		Remote = require('Storage/User/Remote')
+//		Remote = require('Remote/User/Ajax')
 	;
 
 	/**

dev/View/Admin/Login.js

@@ -12,7 +12,7 @@
 		Translator = require('Common/Translator'),
 
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/Admin/Remote'),
+		Remote = require('Remote/Admin/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Admin/Settings/Pane.js

@@ -8,7 +8,7 @@
 		ko = require('ko'),
 
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/Admin/Remote'),
+		Remote = require('Remote/Admin/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/Account.js

@@ -11,7 +11,7 @@
 		Utils = require('Common/Utils'),
 		Translator = require('Common/Translator'),
 
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/Activate.js

@@ -13,7 +13,7 @@
 		Translator = require('Common/Translator'),
 
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/Admin/Remote'),
+		Remote = require('Remote/Admin/Ajax'),
 
 		LicenseStore = require('Stores/Admin/License'),
 

dev/View/Popup/Compose.js

@@ -21,6 +21,8 @@
 		HtmlEditor = require('Common/HtmlEditor'),
 		Translator = require('Common/Translator'),
 
+		Cache = require('Common/Cache'),
+
 		AppStore = require('Stores/User/App'),
 		SettingsStore = require('Stores/User/Settings'),
 		IdentityStore = require('Stores/User/Identity'),
@@ -31,8 +33,7 @@
 		SocialStore = require('Stores/Social'),
 
 		Settings = require('Storage/Settings'),
-		Cache = require('Storage/User/Cache'),
+		Remote = require('Remote/User/Ajax'),
-		Remote = require('Storage/User/Remote'),
 
 		ComposeAttachmentModel = require('Model/ComposeAttachment'),
 
@@ -121,6 +122,7 @@
 		this.subject = ko.observable('');
 		this.isHtml = ko.observable(false);
 
+		this.requestDsn = ko.observable(false);
 		this.requestReadReceipt = ko.observable(false);
 		this.markAsImportant = ko.observable(false);
 
@@ -366,6 +368,7 @@
 						this.aDraftInfo,
 						this.sInReplyTo,
 						this.sReferences,
+						this.requestDsn(),
 						this.requestReadReceipt(),
 						this.markAsImportant()
 					);
@@ -2010,6 +2013,7 @@
 		this.replyTo('');
 		this.subject('');
 
+		this.requestDsn(false);
 		this.requestReadReceipt(false);
 		this.markAsImportant(false);
 

dev/View/Popup/Contacts.js

@@ -21,7 +21,7 @@
 		SettingsStore = require('Stores/User/Settings'),
 		ContactStore = require('Stores/User/Contact'),
 
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		EmailModel = require('Model/Email'),
 		ContactModel = require('Model/Contact'),

dev/View/Popup/Domain.js

@@ -14,7 +14,7 @@
 
 		CapaAdminStore = require('Stores/Admin/Capa'),
 
-		Remote = require('Storage/Admin/Remote'),
+		Remote = require('Remote/Admin/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/FolderClear.js

@@ -11,10 +11,11 @@
 		Utils = require('Common/Utils'),
 		Translator = require('Common/Translator'),
 
+		Cache = require('Common/Cache'),
+
 		MessageStore = require('Stores/User/Message'),
 
-		Cache = require('Storage/User/Cache'),
+		Remote = require('Remote/User/Ajax'),
-		Remote = require('Storage/User/Remote'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/FolderCreate.js

@@ -15,7 +15,7 @@
 
 		FolderStore = require('Stores/User/Folder'),
 
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/FolderSystem.js

@@ -15,7 +15,7 @@
 		FolderStore = require('Stores/User/Folder'),
 
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/Identity.js

@@ -13,7 +13,7 @@
 		Translator = require('Common/Translator'),
 		HtmlEditor = require('Common/HtmlEditor'),
 
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/Plugin.js

@@ -12,7 +12,7 @@
 		Utils = require('Common/Utils'),
 		Translator = require('Common/Translator'),
 
-		Remote = require('Storage/Admin/Remote'),
+		Remote = require('Remote/Admin/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/Template.js

@@ -12,7 +12,7 @@
 		Translator = require('Common/Translator'),
 		HtmlEditor = require('Common/HtmlEditor'),
 
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/Popup/TwoFactorTest.js

@@ -11,7 +11,7 @@
 		Globals = require('Common/Globals'),
 		Utils = require('Common/Utils'),
 
-		Remote = require('Storage/User/Remote'),
+		Remote = require('Remote/User/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/User/Login.js

@@ -22,7 +22,8 @@
 
 		Local = require('Storage/Client'),
 		Settings = require('Storage/Settings'),
-		Remote = require('Storage/User/Remote'),
+		
+		Remote = require('Remote/User/Ajax'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/User/MailBox/FolderList.js

@@ -15,13 +15,13 @@
 		Globals = require('Common/Globals'),
 		Links = require('Common/Links'),
 
+		Cache = require('Common/Cache'),
+
 		AppStore = require('Stores/User/App'),
 		SettingsStore = require('Stores/User/Settings'),
 		FolderStore = require('Stores/User/Folder'),
 		MessageStore = require('Stores/User/Message'),
 
-		Cache = require('Storage/User/Cache'),
-
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')
 	;

dev/View/User/MailBox/MessageList.js

@@ -20,14 +20,15 @@
 		Selector = require('Common/Selector'),
 		Translator = require('Common/Translator'),
 
+		Cache = require('Common/Cache'),
+
 		QuotaStore = require('Stores/User/Quota'),
 		SettingsStore = require('Stores/User/Settings'),
 		FolderStore = require('Stores/User/Folder'),
 		MessageStore = require('Stores/User/Message'),
 
 		Settings = require('Storage/Settings'),
-		Cache = require('Storage/User/Cache'),
+		Remote = require('Remote/User/Ajax'),
-		Remote = require('Storage/User/Remote'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/User/MailBox/MessageView.js

@@ -19,14 +19,15 @@
 		Events = require('Common/Events'),
 		Translator = require('Common/Translator'),
 
+		Cache = require('Common/Cache'),
+
 		SettingsStore = require('Stores/User/Settings'),
 		AccountStore = require('Stores/User/Account'),
 		FolderStore = require('Stores/User/Folder'),
 		MessageStore = require('Stores/User/Message'),
 
 		Local = require('Storage/Client'),
-		Cache = require('Storage/User/Cache'),
+		Remote = require('Remote/User/Ajax'),
-		Remote = require('Storage/User/Remote'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/User/Settings/Menu.js

@@ -11,7 +11,7 @@
 		Globals = require('Common/Globals'),
 		Links = require('Common/Links'),
 
-		Cache = require('Storage/User/Cache'),
+		Cache = require('Common/Cache'),
 
 		kn = require('Knoin/Knoin'),
 		AbstractView = require('Knoin/AbstractView')

dev/View/User/Settings/Pane.js

@@ -32,7 +32,7 @@
 	PaneSettingsUserView.prototype.backToMailBoxClick = function ()
 	{
 		kn.setHash(require('Common/Links').inbox(
-			require('Storage/User/Cache').getFolderInboxName()));
+			require('Common/Cache').getFolderInboxName()));
 	};
 
 	module.exports = PaneSettingsUserView;

package.json

@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.8.1",
-	"release": "266",
+	"release": "267",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",