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