Merge change 23510 into eclair

* changes:
  SMS-to-email fix for messages from the web