Merged fix for bugs 87039, 87093 from trunk
[modest] / ChangeLog
1 * please check the svn log instead