Fixed issue where using custom rooms replaced item rooms with thunderbird rooms

[chadbert]

Added a scoped reference to the correct list of rooms based on the use custom rooms value.