Merge pull request #8941 from borjasalguero/bug_thread_id_rebased

Bug 851032 - [SMS] Receiving a new message it's not properly threaded r=...(cherry picked from commit 86a79ba3fdfb0eb6f593e34887fa89e3553d1a66)

Conflicts:
	apps/sms/js/sms_mock.js