Fixed callback issue and htmlmessage update