Fixes for sms and emiLING