diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index 473fed7e2..259cc2a72 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -53,11 +53,9 @@
 				'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
 		}
 
-		if (Settings.capa(Enums.Capa.AdditionalAccounts))
-		{
-			kn.addSettingsViewModel(require('Settings/User/Accounts'),
-				'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
-		}
+		kn.addSettingsViewModel(require('Settings/User/Accounts'), 'SettingsAccounts',
+			Settings.capa(Enums.Capa.AdditionalAccounts) ?
+				'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME' : 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'accounts');
 
 		if (Settings.capa(Enums.Capa.Sieve))
 		{
diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js
index 98982210d..d7856ee61 100644
--- a/dev/Settings/User/Accounts.js
+++ b/dev/Settings/User/Accounts.js
@@ -14,6 +14,7 @@
 		AccountStore = require('Stores/User/Account'),
 		IdentityStore = require('Stores/User/Identity'),
 
+		Settings = require('Storage/Settings'),
 		Remote = require('Storage/User/Remote')
 	;
 
@@ -22,6 +23,9 @@
 	 */
 	function AccountsUserSettings()
 	{
+		this.allowAdditionalAccount = Settings.capa(Enums.Capa.AdditionalAccounts);
+		this.allowIdentities = true;
+
 		this.accounts = AccountStore.accounts;
 		this.identities = IdentityStore.identities;
 
diff --git a/dev/View/Admin/Settings/Menu.js b/dev/View/Admin/Settings/Menu.js
index c77975c4a..5aab0d423 100644
--- a/dev/View/Admin/Settings/Menu.js
+++ b/dev/View/Admin/Settings/Menu.js
@@ -6,7 +6,6 @@
 	var
 		_ = require('_'),
 
-		Enums = require('Common/Enums'),
 		Globals = require('Common/Globals'),
 
 		kn = require('Knoin/Knoin'),
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index 1a61b0c2c..5ba47fcd5 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -242,8 +242,7 @@
 				aC = this.contactsCheckedOrSelected(),
 				aToEmails = null,
 				aCcEmails = null,
-				aBccEmails = null,
-				aReplyToEmails = null
+				aBccEmails = null
 			;
 
 			if (Utils.isNonEmptyArray(aC))
diff --git a/package.json b/package.json
index e5dcbadbc..6ec71e77d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.8.1",
-	"release": "259",
+	"release": "260",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",
@@ -36,7 +36,7 @@
 		"plugins"
 	],
 	"readmeFilename": "README.md",
-	"ownCloudPackageVersion": "3.0",
+	"ownCloudPackageVersion": "3.1",
 	"engines": {
 		"node": ">= 0.10.0"
 	},
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index cbc59e5ad..8e797050a 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -1,87 +1,91 @@
 <div class="b-settings-accounts g-ui-user-select-none">
-	<div class="form-horizontal">
-		<div class="legend">
-			<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
-			&nbsp;&nbsp;&nbsp;
-			<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: accounts.loading"></i>
+	<div data-bind="visible: allowAdditionalAccount">
+		<div class="form-horizontal">
+			<div class="legend">
+				<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
+				&nbsp;&nbsp;&nbsp;
+				<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: accounts.loading"></i>
+			</div>
 		</div>
+		<a class="btn" data-bind="click: addNewAccount">
+			<i class="icon-user-add"></i>
+			&nbsp;&nbsp;
+			<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
+		</a>
+		<br />
+		<br />
+		<br />
+		<table class="table table-hover list-table accounts-list" data-bind="i18nUpdate: accounts">
+			<colgroup>
+				<col />
+				<col style="width: 150px" />
+				<col style="width: 1%" />
+			</colgroup>
+			<tbody data-bind="sortable: {data: accounts, options: scrollableOptions(), afterMove: accountsAndIdentitiesAfterMove}">
+				<tr class="account-item">
+					<td class="e-action" data-bind="css: {'e-action': canBeEdit}">
+						<span class="account-img icon-user"></span>
+						<i class="icon-braille drag-handle"></i>
+						&nbsp;&nbsp;
+						<span class="account-name" data-bind="text: email"></span>
+					</td>
+					<td>
+						<span data-bind="visible: !canBeDeleted()"></span>
+						<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oAccount) { $root.deleteAccount(oAccount); }">
+							<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
+						</a>
+					</td>
+					<td>
+						<span class="delete-account" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oAccount) { $root.accountForDeletion(oAccount); }">
+							<i class="icon-trash"></i>
+						</span>
+					</td>
+				</tr>
+			</tbody>
+		</table>
 	</div>
-	<a class="btn" data-bind="click: addNewAccount">
-		<i class="icon-user-add"></i>
-		&nbsp;&nbsp;
-		<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
-	</a>
-	<br />
-	<br />
-	<br />
-	<table class="table table-hover list-table accounts-list" data-bind="i18nUpdate: accounts">
-		<colgroup>
-			<col />
-			<col style="width: 150px" />
-			<col style="width: 1%" />
-		</colgroup>
-		<tbody data-bind="sortable: {data: accounts, options: scrollableOptions(), afterMove: accountsAndIdentitiesAfterMove}">
-			<tr class="account-item">
-				<td class="e-action" data-bind="css: {'e-action': canBeEdit}">
-					<span class="account-img icon-user"></span>
-					<i class="icon-braille drag-handle"></i>
-					&nbsp;&nbsp;
-					<span class="account-name" data-bind="text: email"></span>
-				</td>
-				<td>
-					<span data-bind="visible: !canBeDeleted()"></span>
-					<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oAccount) { $root.deleteAccount(oAccount); }">
-						<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
-					</a>
-				</td>
-				<td>
-					<span class="delete-account" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oAccount) { $root.accountForDeletion(oAccount); }">
-						<i class="icon-trash"></i>
-					</span>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-	<br />
-	<div class="form-horizontal">
-		<div class="legend">
-			<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/LEGEND_IDENTITIES"></span>
+	<div data-bind="visible: allowIdentities">
+		<br />
+		<div class="form-horizontal">
+			<div class="legend">
+				<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/LEGEND_IDENTITIES"></span>
+			</div>
 		</div>
+		<a class="btn" data-bind="click: addNewIdentity">
+			<i class="icon-user-add"></i>
+			&nbsp;&nbsp;
+			<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/BUTTON_ADD_IDENTITY"></span>
+		</a>
+		<br />
+		<br />
+		<br />
+		<table class="table table-hover list-table identities-list" data-bind="i18nUpdate: identities">
+			<colgroup>
+				<col />
+				<col style="width: 150px" />
+				<col style="width: 1%" />
+			</colgroup>
+			<tbody data-bind="sortable: {data: identities, options: scrollableOptions(), afterMove: accountsAndIdentitiesAfterMove}">
+				<tr class="identity-item">
+					<td class="e-action">
+						<span class="identity-img icon-user"></span>
+						<i class="icon-braille drag-handle"></i>
+						&nbsp;&nbsp;
+						<span class="identity-name" data-bind="text: formattedName()"></span>
+					</td>
+					<td>
+						<span data-bind="visible: !canBeDeleted()"></span>
+						<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }">
+							<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
+						</a>
+					</td>
+					<td>
+						<span class="delete-identity" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oIdentity) { $root.identityForDeletion(oIdentity); }">
+							<i class="icon-trash"></i>
+						</span>
+					</td>
+				</tr>
+			</tbody>
+		</table>
 	</div>
-	<a class="btn" data-bind="click: addNewIdentity">
-		<i class="icon-user-add"></i>
-		&nbsp;&nbsp;
-		<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/BUTTON_ADD_IDENTITY"></span>
-	</a>
-	<br />
-	<br />
-	<br />
-	<table class="table table-hover list-table identities-list" data-bind="i18nUpdate: identities">
-		<colgroup>
-			<col />
-			<col style="width: 150px" />
-			<col style="width: 1%" />
-		</colgroup>
-		<tbody data-bind="sortable: {data: identities, options: scrollableOptions(), afterMove: accountsAndIdentitiesAfterMove}">
-			<tr class="identity-item">
-				<td class="e-action">
-					<span class="identity-img icon-user"></span>
-					<i class="icon-braille drag-handle"></i>
-					&nbsp;&nbsp;
-					<span class="identity-name" data-bind="text: formattedName()"></span>
-				</td>
-				<td>
-					<span data-bind="visible: !canBeDeleted()"></span>
-					<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }">
-						<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/DELETING_ASK"></span>
-					</a>
-				</td>
-				<td>
-					<span class="delete-identity" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oIdentity) { $root.identityForDeletion(oIdentity); }">
-						<i class="icon-trash"></i>
-					</span>
-				</td>
-			</tr>
-		</tbody>
-	</table>
 </div>
\ No newline at end of file