diff --git a/package.json b/package.json
index 0aa2c42c4..4f8dfb5d8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.8.0",
-	"release": "245",
+	"release": "250",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",
@@ -36,7 +36,7 @@
 		"plugins"
 	],
 	"readmeFilename": "README.md",
-	"ownCloudPackageVersion": "2.2",
+	"ownCloudPackageVersion": "2.3",
 	"engines": {
 		"node": ">= 0.10.0"
 	},
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index d460e5e2d..db5ce44c1 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1437,16 +1437,16 @@ class Actions
 		$aResult['UseLocalProxyForExternalImages'] = (bool) $oConfig->Get('labs', 'use_local_proxy_for_external_images', false);
 
 		// user
-		$aResult['EditorDefaultType'] = (string) $oConfig->Get('webmail', 'editor_default_type', '');
 		$aResult['ShowImages'] = (bool) $oConfig->Get('webmail', 'show_images', false);
-		$aResult['ContactsAutosave'] = true;
 		$aResult['MPP'] = (int) $oConfig->Get('webmail', 'messages_per_page', 25);
 		$aResult['SoundNotification'] = false;
 		$aResult['DesktopNotifications'] = false;
-		$aResult['UseThreads'] = false;
-		$aResult['ReplySameFolder'] = false;
-		$aResult['Layout'] = \RainLoop\Enumerations\Layout::SIDE_PREVIEW;
-		$aResult['UseCheckboxesInList'] = true;
+		$aResult['Layout'] = (int) $oConfig->Get('defaults', 'view_layout', \RainLoop\Enumerations\Layout::SIDE_PREVIEW);
+		$aResult['EditorDefaultType'] = (string) $oConfig->Get('defaults', 'view_editor_type', '');
+		$aResult['UseCheckboxesInList'] = (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true);
+		$aResult['UseThreads'] = (bool) $oConfig->Get('defaults', 'mail_use_threads', false);
+		$aResult['ReplySameFolder'] = (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false);
+		$aResult['ContactsAutosave'] = (bool) $oConfig->Get('defaults', 'contacts_autosave', true);
 		$aResult['DefaultIdentityID'] = '';
 		$aResult['DisplayName'] = '';
 		$aResult['ReplyTo'] = '';
@@ -5539,6 +5539,8 @@ class Actions
 	{
 		$oAccount = $this->initMailClientConnection();
 
+		$oConfig = $this->Config();
+
 		$sDraftFolder = $this->GetActionParam('MessageFolder', '');
 		$sDraftUid = $this->GetActionParam('MessageUid', '');
 		$sSentFolder = $this->GetActionParam('SentFolder', '');
@@ -5691,7 +5693,9 @@ class Actions
 					$oSettings = $this->SettingsProvider()->Load($oAccount);
 
 					$this->AddressBookProvider($oAccount)->IncFrec(
-						$oAccount->ParentEmailHelper(), \array_values($aArrayToFrec), !!$oSettings->GetConf('ContactsAutosave', true));
+						$oAccount->ParentEmailHelper(), \array_values($aArrayToFrec),
+							!!$oSettings->GetConf('ContactsAutosave',
+								!!$oConfig->Get('defaults', 'contacts_autosave', true)));
 				}
 			}
 		}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 46f0595ce..3c9b6bffa 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -73,8 +73,6 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 				'messages_per_page'		=> array(20, ' Number of messages displayed on page by default'),
 
-				'editor_default_type'	=> array('Html', 'Editor mode used by default (Html or Plain)'),
-
 				'attachment_size_limit'	=> array(25,
 					'File size limit (MB) for file upload on compose screen
 0 for unlimited.')
@@ -162,6 +160,15 @@ Values:
 				'enabled_list'	=> array('', 'List of enabled plugins'),
 			),
 
+			'defaults' => array(
+				'view_editor_type'		=> array('Html', 'Editor mode used by default (Plain, Html, HtmlForced or PlainForced)'),
+				'view_layout'			=> array(1, 'layout: 0 - no preview, 1 - side preview, 3 - bottom preview'),
+				'view_use_checkboxes'	=> array(true),
+				'contacts_autosave'		=> array(true),
+				'mail_use_threads'		=> array(false),
+				'mail_reply_same_folder' => array(false)
+			),
+
 			'logs' => array(
 
 				'enable' => array(false, 'Enable logging'),