am 5e1fa607: (-s ours) am 80312972: (-s ours) am feb9a2c6: Merge from open-source gingerbread - do not merge

* commit '5e1fa60708995aff67d4c1fd206670ea9ef6f1ef':
  Fix a decoding problem on the Email body