diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js
index 597871ba7..f012711e3 100644
--- a/dev/Common/HtmlEditor.js
+++ b/dev/Common/HtmlEditor.js
@@ -8,7 +8,6 @@
 		_ = require('_'),
 
 		Globals = require('Common/Globals'),
-		Utils = require('Common/Utils'),
 
 		Settings = require('Storage/Settings')
 	;
diff --git a/package.json b/package.json
index 44ecf9b90..062e9efb6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.7.0",
-	"release": "200",
+	"release": "202",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",
diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
index 8f2c187e5..c736b65ac 100644
--- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
@@ -1879,7 +1879,7 @@ class Actions
 					if (isset($aItem['Id'], $aItem['Email'], $aItem['Name'], $aItem['ReplyTo'], $aItem['Bcc']) &&
 						$aItem['Id'] !== $oAccount->Email())
 					{
-						$oItem = \RainLoop\Identity::NewInstance($aItem['Id'], $aItem['Email'],
+						$oItem = \RainLoop\Model\Identity::NewInstance($aItem['Id'], $aItem['Email'],
 							$aItem['Name'], $aItem['ReplyTo'], $aItem['Bcc']);
 
 						$aIdentities[] = $oItem;
@@ -1901,7 +1901,7 @@ class Actions
 		$aIdentities = array();
 		if ($oAccount)
 		{
-			$oAccountIdentity = \RainLoop\Identity::NewInstance('', $oAccount->Email());
+			$oAccountIdentity = \RainLoop\Model\Identity::NewInstance('', $oAccount->Email());
 
 			$aSubIdentities = array();
 			$oSettings = $this->SettingsProvider()->Load($oAccount);
@@ -1923,7 +1923,7 @@ class Actions
 					{
 						if (0 < \strlen($aItem['Id']))
 						{
-							$oItem = \RainLoop\Identity::NewInstance($aItem['Id'], $aItem['Email']);
+							$oItem = \RainLoop\Model\Identity::NewInstance($aItem['Id'], $aItem['Email']);
 						}
 						else
 						{
@@ -2129,7 +2129,7 @@ class Actions
 
 		if (!$oEditIdentity)
 		{
-			$aIdentities[] = \RainLoop\Identity::NewInstance($sId, $sEmail, $sName, $sReplyTo, $sBcc);
+			$aIdentities[] = \RainLoop\Model\Identity::NewInstance($sId, $sEmail, $sName, $sReplyTo, $sBcc);
 		}
 		else
 		{