diff --git a/dev/Common/Consts.js b/dev/Common/Consts.js
index a5d57752d..ccb6c2d05 100644
--- a/dev/Common/Consts.js
+++ b/dev/Common/Consts.js
@@ -1,3 +1 @@
-export const MESSAGES_PER_PAGE_VALUES = [10, 20, 30, 50, 100];
-
 export const UNUSED_OPTION_VALUE = '__UNUSE__';
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index 41f177ada..db5981378 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -1,6 +1,5 @@
 import ko from 'ko';
 
-import { MESSAGES_PER_PAGE_VALUES } from 'Common/Consts';
 import { SaveSettingsStep } from 'Common/Enums';
 import { EditorDefaultType, Layout } from 'Common/EnumsUser';
 import { Settings, SettingsGet } from 'Common/Globals';
@@ -27,7 +26,6 @@ export class GeneralUserSettings {
 		this.languages = LanguageStore.languages;
 		this.messageReadDelay = SettingsUserStore.messageReadDelay;
 		this.messagesPerPage = SettingsUserStore.messagesPerPage;
-		this.messagesPerPageArray = MESSAGES_PER_PAGE_VALUES;
 
 		this.editorDefaultType = SettingsUserStore.editorDefaultType;
 		this.layout = SettingsUserStore.layout;
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 5d46beef5..a7bdfd0af 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -1,6 +1,5 @@
 import ko from 'ko';
 
-import { MESSAGES_PER_PAGE_VALUES } from 'Common/Consts';
 import { Layout, EditorDefaultType } from 'Common/EnumsUser';
 import { pInt, addObservablesTo } from 'Common/Utils';
 import { $htmlCL, SettingsGet } from 'Common/Globals';
@@ -21,10 +20,12 @@ export const SettingsUserStore = new class {
 			]
 		});
 
-		this.messagesPerPage = ko.observable(SettingsGet('MPP')).extend({ limitedList: MESSAGES_PER_PAGE_VALUES });
+		this.messagesPerPage = ko.observable(pInt(SettingsGet('MPP'))).extend(
+			{ rateLimit: { timeout: 999, method: "notifyWhenChangesStop" } }
+		);
 
 		this.messageReadDelay = ko.observable(pInt(SettingsGet('MessageReadDelay'))).extend(
-			{ rateLimit: { timeout: 500, method: "notifyWhenChangesStop" } }
+			{ rateLimit: { timeout: 999, method: "notifyWhenChangesStop" } }
 		);
 
 		addObservablesTo(this, {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index 2d37ca3d7..48b9f9786 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -50,16 +50,9 @@
 		<div class="control-group">
 			<label class="control-label" data-i18n="SETTINGS_GENERAL/LABEL_MESSAGE_PER_PAGE"></label>
 			<div class="controls">
-				<div data-bind="component: {
-					name: 'Select',
-					params: {
-						options: messagesPerPageArray,
-						value: messagesPerPage,
-						trigger: mppTrigger,
-						size: 2,
-						width: 80
-					}
-				}"></div>
+				<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage"/>
+				&nbsp;
+				<span data-bind="saveTrigger: mppTrigger"></span>
 			</div>
 		</div>
 		<div class="control-group">