Fixed a messages overflow issue