Followed up on message timestamp locking