am 983b837e: Merge change 23510 into eclair

Merge commit '983b837ea1effc462ecd9c14620b19178f98fd92' into eclair-plus-aosp

* commit '983b837ea1effc462ecd9c14620b19178f98fd92':
  SMS-to-email fix for messages from the web