Fix MMS

Some (possibly extraneous?) changes that came as part of the SMSTasks
feature broke MMS.

Change-Id: Id2b3ed8b9378cceaf9074d3cf206dbd7e722cf43