Don't clear comment draft until success

Fixes bug-23