Calculate the true message_count instead of tracking it separately.

This should eliminate the mismatch between what translators see in the message list and what the progress percentage shows.