From 45ff71fd06f56b7475d2c2a7802fecd87c4bb133 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 13 Jul 2016 17:04:45 +0300
Subject: [PATCH] closes #2475

---
 src/messaging.js                  | 2 +-
 src/views/admin/settings/chat.tpl | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/messaging.js b/src/messaging.js
index 1974313c81..276065158c 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -53,7 +53,7 @@ var async = require('async'),
 			roomId = params.roomId,
 			since = params.since,
 			isNew = params.isNew,
-			count = params.count || parseInt(meta.config.chatMessageInboxSize, 10) || 250,
+			count = params.count || 250,
 			markRead = params.markRead || true;
 
 		var min = params.count ? 0 : Date.now() - (terms[since] || terms.day);
diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl
index 3f0fb1e222..9926e25dbe 100644
--- a/src/views/admin/settings/chat.tpl
+++ b/src/views/admin/settings/chat.tpl
@@ -12,9 +12,6 @@
 				</label>
 			</div>
 		</div>
-		<div class="form-group">
-			<strong>Chat Message Inbox Size</strong><br /> <input type="text" class="form-control" value="250" data-field="chatMessageInboxSize">
-		</div>
 
 		<div class="form-group">
 			<label>Maximum length of chat messages</label>