Added quoting to messages