More SMS Tasks improvements (unfinished)

Change-Id: I5ba13964af835ef0093431f7818bf7ca15242a4a