Merged fix for bug 86176 from trunk.
[modest] / modest.git
1 modest.git