Merge pull request #10941 from julienw/890460-fixedheader-followup

Bug 890460 - [SMS] After deleting all the messages in particular thread,...(cherry picked from commit accb67f7beb3f00f8bcf23337e3ced0795cff4c9)