Better msg handling for settings part 2