messages and update message fix