applying same changes for each thread what we did eariler for thread list
Merge branch 'sms-interaction' of https://github.com/kumarrishav/gaia into sms-interaction