Fix unquoted messages as suggested by issue #3