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