Merged fix for 86564 from trunk, using revision 4758.
[modest] / modest.git
1 modest.git