Merge change 9324

* changes:
  Second word lost when SMS is received from email