I'm not speaking about ideally, just about the way things are implemented now :) Will it have effect in any of the caller sites that the locking behavior of SetAddressBook changed? After all the caller sites (if they're correct) already acquire the locks. I recently fixed some UI functions that forgot to acquire the wallet lock (28352af). I *suppose* this is not an issue due to the use of recursive mutexes so it doesn't matter that it acquires/releases another instance of the lock.