Bug 834160 - Part 8-2: fix SMS