diff --git a/client/lib/collections.coffee b/client/lib/collections.coffee
index 8684039e406..f7b0d5c701c 100644
--- a/client/lib/collections.coffee
+++ b/client/lib/collections.coffee
@@ -3,12 +3,7 @@
 
 @ChatRoom = new Meteor.Collection 'data.ChatRoom'
 @ChatSubscription = new Meteor.Collection 'data.ChatSubscription'
-@ChatMessage = new Meteor.Collection 'data.ChatMessage',
-	transform: (message) ->
-		message.html = message.msg
-		message = RocketChat.callbacks.run 'renderMessage', message
-		# console.log 'transform'
-		return message
+@ChatMessage = new Meteor.Collection 'data.ChatMessage'
 
 Meteor.startup ->
 	ChatMessage.find().observe
diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
index f2f8af73181..27ef90a85d7 100644
--- a/client/views/app/chatMessageDashboard.coffee
+++ b/client/views/app/chatMessageDashboard.coffee
@@ -14,12 +14,6 @@ Template.chatMessageDashboard.helpers
 	isEditing: ->
 		return this._id is Session.get('editingMessageId')
 
-	preProcessingMessage: ->
-
-		this.html = this.msg
-		message = RocketChat.callbacks.run 'renderMessage', this
-		return message.html
-
 	message: ->
 		switch this.t
 			when 'r' then t('chatMessageDashboard.Room_name_changed', { room_name: this.msg, user_by: Session.get('user_' + this.u._id + '_name') }) + '.'
diff --git a/client/views/app/chatMessageDashboard.html b/client/views/app/chatMessageDashboard.html
index abf34facef3..b3cb1e335bc 100644
--- a/client/views/app/chatMessageDashboard.html
+++ b/client/views/app/chatMessageDashboard.html
@@ -42,7 +42,7 @@
 					</span>
 					{{/if}}
 					<div>
-						{{{preProcessingMessage}}}
+						{{#emojione}}{{html}}{{/emojione}}
 					</div>
 				{{/if}}
 			{{/if}}
diff --git a/packages/rocketchat-autolinker/autolinker.coffee b/packages/rocketchat-autolinker/autolinker.coffee
index 6dac64a8547..b07f2479621 100644
--- a/packages/rocketchat-autolinker/autolinker.coffee
+++ b/packages/rocketchat-autolinker/autolinker.coffee
@@ -10,4 +10,4 @@ class AutoLinker
 		
 		return message
 
-RocketChat.callbacks.add 'renderMessage', AutoLinker
+RocketChat.callbacks.add 'beforeSaveMessage', AutoLinker
diff --git a/packages/rocketchat-highlight/highlight.coffee b/packages/rocketchat-highlight/highlight.coffee
index 32410acb853..4e987d9c808 100644
--- a/packages/rocketchat-highlight/highlight.coffee
+++ b/packages/rocketchat-highlight/highlight.coffee
@@ -35,4 +35,4 @@ class Highlight
 
 		return message
 
-RocketChat.callbacks.add 'renderMessage', Highlight, RocketChat.callbacks.priority.HIGH
\ No newline at end of file
+RocketChat.callbacks.add 'beforeSaveMessage', Highlight, RocketChat.callbacks.priority.HIGH
\ No newline at end of file
diff --git a/packages/rocketchat-markdown/markdown.coffee b/packages/rocketchat-markdown/markdown.coffee
index cc430624890..c471f304854 100644
--- a/packages/rocketchat-markdown/markdown.coffee
+++ b/packages/rocketchat-markdown/markdown.coffee
@@ -15,4 +15,4 @@ class Markdown
 		message.html = msg
 		return message
 
-RocketChat.callbacks.add 'renderMessage', Markdown, RocketChat.callbacks.priority.LOW
\ No newline at end of file
+RocketChat.callbacks.add 'beforeSaveMessage', Markdown, RocketChat.callbacks.priority.LOW
\ No newline at end of file
diff --git a/packages/rocketchat-me/me.coffee b/packages/rocketchat-me/me.coffee
index 965b2b6d296..3a80168a518 100644
--- a/packages/rocketchat-me/me.coffee
+++ b/packages/rocketchat-me/me.coffee
@@ -11,4 +11,4 @@ class Me
 				message.html = '_' + message.html.replace('/me ','') + '_'
 		return message
 
-RocketChat.callbacks.add 'renderMessage', Me
+RocketChat.callbacks.add 'beforeSaveMessage', Me
diff --git a/packages/rocketchat-mentions/client.coffee b/packages/rocketchat-mentions/client.coffee
index c0307b507ad..fdd889c5678 100644
--- a/packages/rocketchat-mentions/client.coffee
+++ b/packages/rocketchat-mentions/client.coffee
@@ -20,4 +20,4 @@ class MentionsClient
 			message.html = msg
 		return message
 
-RocketChat.callbacks.add 'renderMessage', MentionsClient
\ No newline at end of file
+RocketChat.callbacks.add 'beforeSaveMessage', MentionsClient
\ No newline at end of file
diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index 51cd98ee39a..b97425952d4 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -14,35 +14,7 @@ Meteor.methods
 		message.ts = new Date()
 
 		message.html = message.msg
-
-		# if _.trim(message.html) isnt ''
-		# 	message.html = _.escapeHTML message.html
-		# 	message.html = message.html.replace /\n/g, '<br/>'
-			
-			# Process links in message
-			# msg = Autolinker.link(msg, { stripPrefix: false, twitter: false })
-
-			# Process MD like for strong, italic and strike
-			# msg = msg.replace(/\*([^*]+)\*/g, '<strong>$1</strong>')
-			# msg = msg.replace(/\_([^_]+)\_/g, '<i>$1</i>')
-			# msg = msg.replace(/\~([^_]+)\~/g, '<strike>$1</strike>')
-
-			# Highlight mentions
-			# if not message.mentions? or message.mentions.length is 0
-			# 	mentions = _.map message.mentions, (mention) ->
-			# 		return mention.username or mention
-
-			# 	mentions = mentions.join('|')
-			# 	msg = msg.replace new RegExp("(?:^|\\s)(@(#{mentions}))(?:\\s|$)", 'g'), (match, mention, username) ->
-			# 		return match.replace mention, "<a href=\"\" class=\"mention-link\" data-username=\"#{username}\">#{mention}</a>"
-
-		# message = RocketChat.callbacks.run 'beforeSaveMessage', message
-		if _.trim(message.html) isnt ''
-			message.html = _.escapeHTML message.html
-
 		message = RocketChat.callbacks.run 'beforeSaveMessage', message
-		message.html = message.html.replace /\n/g, '<br/>'	
-		# console.log "message", message
 
 		###
 		Defer other updated as their return is not interesting to the user