Revert "second message modify"

This reverts commit ba8b4282a464c7f37ac5ce7036187efb8d4657d6.