Fix for subscriptions->messages wonkiness.
Merge pull request #315 from TheMightyBuzzard/quickfix

Fix for subscriptions->messages wonkiness.