add lang support for drafts (#826 & #1107)

Fix #826
Fix #1107
Merge pull request #1201 from hrbonz/draft_lang

Add language support for drafts