diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index cfff27c696e..30a5463e848 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -3,6 +3,7 @@ Meteor.startup ->
 	UserPresence.start()
 
 	window.lastMessageWindow = {}
+	window.lastMessageWindowHistory = {}
 
 	@defaultUserLanguage = -> 
 		lng = window.navigator.userLanguage || window.navigator.language || 'en'
diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
index 497655e653f..1ec8ee2cb83 100644
--- a/client/views/app/chatMessageDashboard.coffee
+++ b/client/views/app/chatMessageDashboard.coffee
@@ -68,7 +68,7 @@ Template.chatMessageDashboard.onRendered ->
 	chatMessages = $('.messages-box .wrapper')
 	message = $(this.firstNode)
 
-	if message.data('scroll-to-bottom')?
+	if this.data.scroll? and message.data('scroll-to-bottom')?
 		if message.data('scroll-to-bottom') and (this.parentTemplate().scrollOnBottom or this.data.data.uid is Meteor.userId())
 			chatMessages.stop().animate({scrollTop: 99999}, 1000 )
 		else
diff --git a/client/views/app/chatWindowDashboard.html b/client/views/app/chatWindowDashboard.html
index 63dcc7ee271..ea354ad3c9d 100644
--- a/client/views/app/chatWindowDashboard.html
+++ b/client/views/app/chatWindowDashboard.html
@@ -29,7 +29,7 @@
 						</li>
 					{{/if}}
 					{{#each messagesHistory}}
-						{{#if newDate}}
+						{{#if newDateHistory}}
 							<li class="date">
 								<span>{{messageDate}}</span>
 							</li>