This patch it's about multirecipient, so we should use `thread_id` (actually this is the main change needed)