Fixes NB#132390, added a couple of extra checks to prevent invalid dereferences
[modest] / ChangeLog
1 * please check the git log instead. A dump of log in this ChangeLog may happen
2   soon.