Message stats improvements