Revert "Messages Improved"

This reverts commit d79745df23f62591665fbb5c16517df8003a3a2b.