mailNews refactoring
Merge branch '7180_hashpasswords' into develop