diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js
index c5c50e1b2..7fe4c6488 100644
--- a/dev/Settings/Admin/Domains.js
+++ b/dev/Settings/Admin/Domains.js
@@ -25,6 +25,9 @@
 		}, this);
 
 		this.domainForDeletion = ko.observable(null).deleteAccessHelper();
+
+		this.onDomainListChangeRequest = _.bind(this.onDomainListChangeRequest, this);
+		this.onDomainLoadRequest = _.bind(this.onDomainLoadRequest, this);
 	}
 
 	DomainsAdminSettings.prototype.createDomain = function ()
@@ -35,13 +38,13 @@
 	DomainsAdminSettings.prototype.deleteDomain = function (oDomain)
 	{
 		this.domains.remove(oDomain);
-		Remote.domainDelete(_.bind(this.onDomainListChangeRequest, this), oDomain.name);
+		Remote.domainDelete(this.onDomainListChangeRequest, oDomain.name);
 	};
 
 	DomainsAdminSettings.prototype.disableDomain = function (oDomain)
 	{
 		oDomain.disabled(!oDomain.disabled());
-		Remote.domainDisable(_.bind(this.onDomainListChangeRequest, this), oDomain.name, oDomain.disabled());
+		Remote.domainDisable(this.onDomainListChangeRequest, oDomain.name, oDomain.disabled());
 	};
 
 	DomainsAdminSettings.prototype.onBuild = function (oDom)
@@ -52,7 +55,7 @@
 				var oDomainItem = ko.dataFor(this);
 				if (oDomainItem)
 				{
-					Remote.domain(_.bind(self.onDomainLoadRequest, self), oDomainItem.name);
+					Remote.domain(self.onDomainLoadRequest, oDomainItem.name);
 				}
 			})
 		;
diff --git a/package.json b/package.json
index fc9df6814..694a23d49 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "RainLoop",
   "title": "RainLoop Webmail",
   "version": "1.10.1",
-  "release": "121",
+  "release": "123",
   "private": true,
   "ownCloudPackageVersion": "4.17",
   "description": "Simple, modern & fast web-based email client",
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 1eb0d0f26..44b76964b 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -4082,8 +4082,20 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 		$sSearch = (string) $this->GetActionParam('Search', '');
 
 		$iOffset = 0;
-		$iLimit = 99;
 		$sSearch = '';
+		$iLimit = $this->Config()->Get('labs', 'domain_list_limit', 99);
+
+		$sSearch = \trim($sSearch);
+
+		if ($iOffset < 0)
+		{
+			$iOffset = 0;
+		}
+
+		if ($iLimit < 20)
+		{
+			$iLimit = 20;
+		}
 
 		return $this->DefaultResponse(__FUNCTION__,
 			$this->DomainProvider()->GetList($iOffset, $iLimit, $sSearch));
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 84533d06c..7a6772dc4 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
@@ -418,6 +418,7 @@ Enables caching in the system'),
 				'imap_timeout' => array(300),
 				'smtp_timeout' => array(60),
 				'sieve_timeout' => array(10),
+				'domain_list_limit' => array(99),
 				'mail_func_clear_headers' => array(true),
 				'mail_func_additional_parameters' => array(false),
 				'favicon_status' => array(true),