(not in this patch but) I think updateThreadWithContact could take the phoneNumber directly from the thread's dataset and not take it from the parameter now.