Notifications: Improve channel detection
Merge pull request #168 from lorenzhs/notifications

Notifications: Improve channel detection