diff --git a/client/lib/RoomHistoryManager.coffee b/client/lib/RoomHistoryManager.coffee
index e2fbe11d125..2b3beb90695 100644
--- a/client/lib/RoomHistoryManager.coffee
+++ b/client/lib/RoomHistoryManager.coffee
@@ -21,7 +21,7 @@
 
 		#$('.messages-box .wrapper').data('previous-height', $('.messages-box .wrapper').get(0)?.scrollHeight - $('.messages-box .wrapper').get(0)?.scrollTop)
 		# ScrollListener.setLoader true
-		lastMessage = ChatMessageHistory.findOne({rid: rid}, {sort: {ts: 1}})
+		lastMessage = ChatMessage.findOne({rid: rid}, {sort: {ts: 1}})
 		# lastMessage ?= ChatMessage.findOne({rid: rid}, {sort: {ts: 1}})
 
 		if lastMessage?
@@ -30,7 +30,7 @@
 			ts = new Date
 
 		Meteor.call 'loadHistory', rid, ts, limit, 0, (err, result) ->
-			ChatMessageHistory.insert item for item in result
+			ChatMessage.insert item for item in result
 			room.isLoading.set false
 			room.loaded += result.length
 			if result.length < limit
@@ -53,7 +53,7 @@
 		return room.isLoading.get()
 
 	clear = (rid) ->
-		ChatMessageHistory.remove({ rid: rid })
+		ChatMessage.remove({ rid: rid })
 		if histories[rid]?
 			histories[rid].hasMore.set true
 			histories[rid].isLoading.set false
diff --git a/client/lib/RoomManager.coffee b/client/lib/RoomManager.coffee
index 73b84a2373f..2baf2ce81b8 100644
--- a/client/lib/RoomManager.coffee
+++ b/client/lib/RoomManager.coffee
@@ -23,7 +23,7 @@
 			delete openedRooms[rid].timeout
 			delete openedRooms[rid].dom
 
-			ChatMessageHistory.remove rid: rid
+			ChatMessage.remove rid: rid
 
 	computation = Tracker.autorun ->
 		for rid, record of openedRooms when record.active is true
@@ -63,9 +63,9 @@
 
 				msgStream.on rid, (msg) ->
 					if msg._deleted?
-						return ChatMessageHistory.remove _id: msg._id
+						return ChatMessage.remove _id: msg._id
 
-					ChatMessageHistory.upsert { _id: msg._id }, msg
+					ChatMessage.upsert { _id: msg._id }, msg
 
 				computation.invalidate()
 
diff --git a/client/lib/chatMessages.coffee b/client/lib/chatMessages.coffee
index f587e8fe928..a8aa18c9089 100644
--- a/client/lib/chatMessages.coffee
+++ b/client/lib/chatMessages.coffee
@@ -45,7 +45,7 @@
 		return if element.classList.contains("system")
 		clearEditing()
 		id = element.getAttribute("id")
-		message = ChatMessageHistory.findOne { _id: id, 'u._id': Meteor.userId() }
+		message = ChatMessage.findOne { _id: id, 'u._id': Meteor.userId() }
 		input.value = message.msg
 		editing.element = element
 		editing.index = index or getEditingIndex(element)
diff --git a/client/lib/collections.coffee b/client/lib/collections.coffee
index 61ffe115125..9a0b2203e66 100644
--- a/client/lib/collections.coffee
+++ b/client/lib/collections.coffee
@@ -1,29 +1,4 @@
-@UserAndRoom = new Meteor.Collection null
-@ChatMessageHistory = new Meteor.Collection null
-
+@ChatMessage = new Meteor.Collection null
 @ChatRoom = new Meteor.Collection 'rocketchat_room'
 @ChatSubscription = new Meteor.Collection 'rocketchat_subscription'
-#@ChatMessage = new Meteor.Collection 'rocketchat_message'
-
-# Meteor.startup ->
-# 	ChatMessage.find().observe
-# 		added: (record) ->
-# 			if record._deleted is true
-# 				ChatMessageHistory.remove {_id: record._id}
-# 				return
-
-# 			if ChatRoom._collection._docs._map[record.rid]? and not ChatMessageHistory._collection._docs._map[record._id]?
-# 				ChatMessageHistory.insert record
-
-# 		changed: (record) ->
-# 			if record._deleted is true
-# 				ChatMessageHistory.remove {_id: record._id}
-# 				return
-
-# 			_id = record._id
-# 			delete record._id
-
-# 			ChatMessageHistory.update { _id: _id }, { $set: record }
-
-		# removed: (record) ->
-		# 	ChatMessageHistory.remove {_id: record._id}
+@UserAndRoom = new Meteor.Collection null
diff --git a/client/methods/sendMessage.coffee b/client/methods/sendMessage.coffee
index a11d9a3f052..2dc78eeb8f7 100644
--- a/client/methods/sendMessage.coffee
+++ b/client/methods/sendMessage.coffee
@@ -13,4 +13,4 @@ Meteor.methods
 
 			message = RocketChat.callbacks.run 'beforeSaveMessage', message
 
-			ChatMessageHistory.insert message
+			ChatMessage.insert message
diff --git a/client/methods/updateMessage.coffee b/client/methods/updateMessage.coffee
index 9f522044698..477a08def69 100644
--- a/client/methods/updateMessage.coffee
+++ b/client/methods/updateMessage.coffee
@@ -8,7 +8,7 @@ Meteor.methods
 			message.ets = new Date(Date.now() + TimeSync.serverOffset())
 			message = RocketChat.callbacks.run 'beforeSaveMessage', message
 
-			ChatMessageHistory.update
+			ChatMessage.update
 				_id: message.id
 				'u._id': Meteor.userId()
 			,
@@ -22,6 +22,6 @@ Meteor.methods
 
 		Tracker.nonreactive ->
 
-			ChatMessageHistory.remove
+			ChatMessage.remove
 				_id: message.id
 				'u._id': Meteor.userId()
diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 3aa8786e45d..400745958db 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -24,7 +24,7 @@ Template.room.helpers
 
 	messagesHistory: ->
 		console.log 'room.helpers messagesHistory' if window.rocketDebug
-		return ChatMessageHistory.find { rid: this._id, t: { '$ne': 't' }  }, { sort: { ts: 1 } }
+		return ChatMessage.find { rid: this._id, t: { '$ne': 't' }  }, { sort: { ts: 1 } }
 
 	hasMore: ->
 		console.log 'room.helpers hasMore' if window.rocketDebug