fix crash issue
Merge branch '0.1-ENCRYPT' of https://github.com/mingzhouyang/k-9.git into 0.1-ENCRYPT