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