Return of the DefaultSystemMessageQueue fixes. #3170

These fixes from ticket 3064 got lost in the system message queue rewrite.