Fix server-side default of collapse_message_with_subject = true
This setting was being ignored after the transition to server-side configuration. Make sure it's honoured again.
This setting was being ignored after the transition to server-side configuration. Make sure it's honoured again.