Fixed a problem with & in messages (again).