Properly count messages