Fixed messages remaining calculation