Some SMS Tasks improments (unfinished)

Change-Id: I6c2d9dd59298c975f2008237827eae548705f10f