Fixing messages location
Messages tweak