Improved Messages logic