Added support for Draft-status as well (+ additional "Save" button)