Prevent system msg from being deleted and enable reactivity again

client/lib/collections.coffee

@@ -13,3 +13,6 @@ Meteor.startup ->
 
 		changed: (record) ->
 			ChatMessageHistory.update {_id: record._id, msg: {$ne: record.msg}}, record
+
+		removed: (record) ->
+			ChatMessageHistory.remove {_id: record._id} 

client/methods/updateMessage.coffee

@@ -21,7 +21,7 @@ Meteor.methods
 			throw new Meteor.Error 203, t('general.User_logged_out')
 
 		Tracker.nonreactive ->
-
-			ChatMessageHistory.remove
+			
+			ChatMessage.remove
 				_id: message.id
 				'u._id': Meteor.userId()

client/views/app/room.coffee

@@ -442,6 +442,8 @@ Template.room.events
 		Session.set('showUserInfo', $(e.currentTarget).data('username'))
 
 	'click .delete-message': (event) ->
+		msg = event.currentTarget.parentNode.parentNode
+		return if msg.classList.contains("system")
 		swal {
 		  title: t('Are_you_sure')
 		  text: t('You_will_not_be_able_to_recover')
@@ -454,7 +456,7 @@ Template.room.events
 			html: false
 		}, ->
 		  swal t('Deleted'), t('Your_entry_has_been_deleted'), 'success'
-				ChatMessages.deleteMsg(event.currentTarget.parentNode.parentNode)
+				ChatMessages.deleteMsg(msg)
 
 Template.room.onCreated ->
 	console.log 'room.onCreated' if window.rocketDebug