[SMS] fixes by Till