Closes #1705; Fix ungroup of messages after join message

RocketChat · Dec 23, 2015 · bfa7d3f · bfa7d3f
1 parent 87982b5
commit bfa7d3f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee
@@ -128,7 +128,7 @@ Template.message.onViewRendered = (context) ->
 			else
 				$currentNode.removeClass('new-day')
 
-			if previousDataset.groupable is 'false'
+			if previousDataset.groupable is 'false' or currentDataset.groupable is 'false'
 				$currentNode.removeClass('sequential')
 			else
 				if previousDataset.username isnt currentDataset.username or parseInt(currentDataset.timestamp) - parseInt(previousDataset.timestamp) > RocketChat.settings.get('Message_GroupingPeriod') * 1000