Moved message counting to MessageNotifier