Moved checks from notifyAccount() to shouldNotifyForMessage()

This should fix the "notification count" for cases where messages
passed the shouldNotifyForMessage() checks but not the ones in
notifyAccount().