Merged fix for bugs 87174, 86213 from trunk
[modest] / modest.git
1 modest.git