Work to improve drafts folder management (fixes NB#56483).