Fixes #819 Privacy violation and other issues with - Drafts

Fixes #819 Privacy violation and other issues with - Drafts
Space please, also the quotes are unessasary...  :smile: