Bug 864558 - Fix some minor issues with SMS sending and filtering.  r=mounir, r=mrbkap taking into consideration a comment by bz, a=bajaj