Merge change 21659 into eclair

* changes:
  Fix for Mms without wifi.