Fixed bug with messages that contain apostrophes