Changes for SMS in v2.1

Pls, let this unchanged.