Merge change 26946 into eclair

* changes:
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.