Fixed message editing