Come cleanup (comments, whitespace etc)
Fixed message cloning not copying content string.