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