Bug 918970 - display existing thread when sending a sms from contact app

This gives an easy-to-resolve conflict with current master