Adapting the outbox to check for enabled storages