[FIX] Save drafts clear text, if there is no key.
Additional changes for last commit.