Merged fix for bug 87350 from trunk.
[modest] / modest.git
2006-04-28 Jose Dapena PazInitial commit