Merged fix for bug 87350 from trunk.
[modest] / ChangeLog
1 * please check the svn log instead