Bug 833291 - Part 1/N: add threadId to SmsMessage