Add support for embedded unclaimed draft