Merged fixes for bugs 87366 and 87102 from trunk
[modest] / modest.git
2006-04-28 Jose Dapena PazInitial commit