fixing the broken sms stuff.
Merge branch 'dan' into 3divs-dev