@@ -4,8 +4,6 @@ Meteor.startup ->
 		icon: 'icon-pin'
 		i18nLabel: 'Pin_Message'
 		action: (event, instance) ->
-			event.preventDefault()
-			event.stopPropagation()
 			message = @_arguments[1]
 			message.pinned = true
 			Meteor.call 'pinMessage', message, (error, result) ->
@@ -26,8 +24,6 @@ Meteor.startup ->
 		icon: 'icon-eraser'
 		i18nLabel: 'Unpin_Message'
 		action: (event, instance) ->
-			event.preventDefault()
-			event.stopPropagation()
 			message = @_arguments[1]
 			message.pinned = false
 			Meteor.call 'unpinMessage', message, (error, result) ->
 
@@ -0,0 +1,26 @@
+Meteor.methods
+	pinMessage: (message) ->
+		if not Meteor.userId()
+			throw new Meteor.Error('invalid-user', "[methods] pinMessage -> Invalid user")
+
+		if not RocketChat.settings.get 'Message_AllowPinning'
+			throw new Meteor.Error 'message-pinning-not-allowed', '[methods] pinMessage -> Message pinning not allowed'
+
+
+		ChatMessage.update
+			_id: message._id
+		,
+			$set: { pinned: true }
+
+	unpinMessage: (message) ->
+		if not Meteor.userId()
+			throw new Meteor.Error('invalid-user', "[methods] pinMessage -> Invalid user")
+
+		if not RocketChat.settings.get 'Message_AllowPinning'
+			throw new Meteor.Error 'message-pinning-not-allowed', '[methods] pinMessage -> Message pinning not allowed'
+
+
+		ChatMessage.update
+			_id: message._id
+		,
+			$set: { pinned: false }
@@ -17,6 +17,7 @@ Package.onUse(function(api) {
 	api.addFiles([
 		'client/lib/PinnedMessage.coffee',
 		'client/actionButton.coffee',
+		'client/pinMessage.coffee',
 		'client/tabBar.coffee',
 		'client/views/pinnedMessages.html',
 		'client/views/pinnedMessages.coffee',
 
@@ -39,8 +39,6 @@ Template.message.helpers
 		# otherwise a special "?" character that will be
 		# rendered as a special avatar
 		return @editedBy?.username or "?"
-	pinned: ->
-		return this.pinned
 	canEdit: ->
 		hasPermission = RocketChat.authz.hasAtLeastOnePermission('edit-message', this.rid)
 		isEditAllowed = RocketChat.settings.get 'Message_AllowEditing'
@@ -61,10 +59,6 @@ Template.message.helpers
 			return true
 
 		return RocketChat.settings.get('Message_AllowDeleting') and this.u?._id is Meteor.userId()
-	canPin: ->
-		return RocketChat.settings.get 'Message_AllowPinning'
-	canStar: ->
-		return RocketChat.settings.get 'Message_AllowStarring'
 	showEditedStatus: ->
 		return RocketChat.settings.get 'Message_ShowEditedStatus'
 	label: ->
 
@@ -377,14 +377,6 @@ Template.room.events
 		ChatMessage.update {_id: this._arguments[1]._id, 'urls.url': $(event.currentTarget).data('url')}, {$set: {'urls.$.downloadImages': true}}
 		ChatMessage.update {_id: this._arguments[1]._id, 'attachments.image_url': $(event.currentTarget).data('url')}, {$set: {'attachments.$.downloadImages': true}}
 
-	'click .pin-message': (event) ->
-		message = @_arguments[1]
-		instance = Template.instance()
-		if message.pinned
-			chatMessages[Session.get('openedRoom')].unpinMsg(message)
-		else
-			chatMessages[Session.get('openedRoom')].pinMsg(message)
-
 	'dragenter .dropzone': (e) ->
 		e.currentTarget.classList.add 'over'