diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 17820dcadc..64b632f24d 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -103,6 +103,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
 		module.bringModalToTop(chatModal);
 		checkOnlineStatus(chatModal);
 		taskbar.updateActive(uuid);
+		scrollToBottom(chatModal.find('#chat-content'));
 		chatModal.find('#chat-message-input').focus();
 	}
 
@@ -153,10 +154,14 @@ define(['taskbar', 'string'], function(taskbar, S) {
 		var date = new Date(parseInt(timestamp, 10));
 
 		chatContent.append('[' + date.toLocaleTimeString() + '] ' + message);
+		scrollToBottom(chatContent);
+	};
+
+	function scrollToBottom(chatContent) {
 		chatContent.scrollTop(
 			chatContent[0].scrollHeight - chatContent.height()
 		);
-	};
+	}
 
 	module.toggleNew = function(uuid, state) {
 		taskbar.toggleNew(uuid, state);
diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index 2fe46bbdc0..73ea33faa8 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -104,6 +104,7 @@
 		<strong>Post Delay</strong><br /> <input type="text" class="form-control" value="10000" data-field="postDelay"><br />
 		<strong>Minimum Title Length</strong><br /> <input type="text" class="form-control" value="3" data-field="minimumTitleLength"><br />
 		<strong>Minimum Post Length</strong><br /> <input type="text" class="form-control" value="8" data-field="minimumPostLength"><br />
+		<strong>Chat Messages To Display</strong><br /> <input type="text" class="form-control" value="50" data-field="chatMessagesToDisplay"><br />
 		<div class="checkbox">
 			<label>
 				<input type="checkbox" data-field="allowGuestPosting"> <strong>Allow guests to post without logging in</strong>
diff --git a/src/install.js b/src/install.js
index a0354ec43c..b5c4d4b089 100644
--- a/src/install.js
+++ b/src/install.js
@@ -233,6 +233,9 @@ var async = require('async'),
 						}, {
 							field: 'maximumProfileImageSize',
 							value: 256
+						}, {
+							field: 'chatMessagesToDisplay',
+							value: 50
 						}, {
 							field: 'theme:type',
 							value: 'local'
diff --git a/src/messaging.js b/src/messaging.js
index 948f715448..ec0c62512e 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -1,6 +1,7 @@
 var db = require('./database'),
 	async = require('async'),
-	user = require('./user');
+	user = require('./user'),
+	meta = require('./meta');
 
 
 (function(Messaging) {
@@ -38,7 +39,7 @@ var db = require('./database'),
 	Messaging.getMessages = function(fromuid, touid, callback) {
 		var uids = sortUids(fromuid, touid);
 
-		db.getListRange('messages:' + uids[0] + ':' + uids[1], 0, -1, function(err, mids) {
+		db.getListRange('messages:' + uids[0] + ':' + uids[1], -((meta.config.chatMessagesToDisplay || 50) - 1), -1, function(err, mids) {
 			if (err) {
 				return callback(err, null);
 			}
@@ -49,6 +50,9 @@ var db = require('./database'),
 
 
 			user.getUserField(touid, 'username', function(err, tousername) {
+				if(err) {
+					return callback(err, null);
+				}
 
 				var messages = [];
 
@@ -78,7 +82,7 @@ var db = require('./database'),
 				});
 			});
 		});
-	}
+	};
 
 	Messaging.updateChatTime = function(uid, toUid, callback) {
 		db.sortedSetAdd('uid:' + uid + ':chats', Date.now(), toUid, function(err) {
@@ -90,11 +94,11 @@ var db = require('./database'),
 
 	Messaging.getRecentChats = function(uid, callback) {
 		db.getSortedSetRevRange('uid:' + uid + ':chats', 0, 9, function(err, uids) {
-			if (!err) {
-				user.getMultipleUserFields(uids, ['username', 'picture', 'uid'], callback);
-			} else {
-				callback(err);
+			if(err) {
+				return callback(err);
 			}
+
+			user.getMultipleUserFields(uids, ['username', 'picture', 'uid'], callback);
 		});
 	};