FIX: Broken notification history
Merge pull request #2775 from riking/notification-hotfix

FIX: Broken notification history