Removed system messages from message query counts.  Fixes #38