Set Finish on Message

Set Finish on Message