Merge change 26895 into eclair

* changes:
  Subject issue in MMS message