Some SMS Tasks improments (unfinished)

Change-Id: I6c2d9dd59298c975f2008237827eae548705f10f
More Fixes for SMS Tasks (unfinished)

Change-Id: I858c34be095996ecd5811ee5919913e2dd71410d