Indicate current subscription on list
Merge pull request #628 from andrerod/dev

Indicate current subscription on list