modify message when sendMessage

Change-Id: I0b6f243609694c93d05368b4812a04243e71b083
Merge "modify message when sendMessage"