Merge change 4939

* changes:
  mods so that we can search mms messages