Fixed message body concatenation; other logic bugs remain