diff --git a/package.json b/package.json
index 062e9efb6..065ded099 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.7.0",
-	"release": "202",
+	"release": "203",
 	"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 2278c8f92..a18066e86 100644
--- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
@@ -1403,7 +1403,8 @@ class Actions
 		$aResult['LangLink'] = './?/Lang/0/'.($bAdmin ? 'en' : $aResult['Language']).'/'.$sStaticCache.'/';
 		$aResult['TemplatesLink'] = './?/Templates/0/'.($bAdmin ? 'Admin' : 'App').'/'.$sStaticCache.'/';
 		$aResult['PluginsLink'] = $sPluginsLink;
-		$aResult['EditorDefaultType'] = 'Html' === $aResult['EditorDefaultType'] ? 'Html' : 'Plain';
+		$aResult['EditorDefaultType'] = \in_array($aResult['EditorDefaultType'], array('Plain', 'Html', 'HtmlForced', 'PlainForced')) ?
+			$aResult['EditorDefaultType'] : 'Plain';
 
 		// IDN
 		$aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']);
diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/DefaultSettings.php b/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/DefaultSettings.php
index 4a191a44f..95eec2ec1 100644
--- a/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/DefaultSettings.php
+++ b/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/DefaultSettings.php
@@ -24,7 +24,7 @@ class DefaultSettings implements \RainLoop\Providers\Settings\SettingsInterface
 	 *
 	 * @return array
 	 */
-	public function Load(\RainLoop\Model\Account $oAccount)
+	public function Load($oAccount)
 	{
 		$sValue = $this->oStorageProvider->Get($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
@@ -49,7 +49,7 @@ class DefaultSettings implements \RainLoop\Providers\Settings\SettingsInterface
 	 *
 	 * @return bool
 	 */
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings)
+	public function Save($oAccount, array $aSettings)
 	{
 		return $this->oStorageProvider->Put($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/SettingsInterface.php b/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/SettingsInterface.php
index 563d8fb9b..91eba8e46 100644
--- a/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/SettingsInterface.php
+++ b/rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/SettingsInterface.php
@@ -9,7 +9,7 @@ interface SettingsInterface
 	 *
 	 * @return array
 	 */
-	public function Load(\RainLoop\Model\Account $oAccount);
+	public function Load($oAccount);
 
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
@@ -17,7 +17,7 @@ interface SettingsInterface
 	 *
 	 * @return bool
 	 */
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings);
+	public function Save($oAccount, array $aSettings);
 
 	/**
 	 * @param string $sEmail