Fix bugs on Edit Message and Unlock Message