Merge pull request #8123 from borjasalguero/bug_editmode_thread

Bug 841684 - [SMS][Edit mode] Thread is not created properly when receiv...(cherry picked from commit 53e7c0ea7110f29ff080680547fc5def81f5d6ce)
(cherry picked from commit 612bf320f228219d9e78d6f9da64057aa7d1fa09)