Merge pull request #8941 from borjasalguero/bug_thread_id_rebased

Bug 851032 - [SMS] Receiving a new message it's not properly threaded r=...