Fixes for message counting and recipients counting