Some changes to Message partial