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

Fix #826
Fix #1107