Merge pull request #27 from dhuyvett/phonegap-2.x.x

Fixed on Android 2.x
some cleanup
Issue #24 - Changed default draft to draft 17