Fixed messages not displaying correctly.