A method and apparatus of a device that clusters threads of messages is described. In an exemplary method, the device receives multiple message threads, where each message thread includes one or more messages that are related to each message in that thread. For each of the message threads, the device computes a thread signature using affinity groups, where each affinity group is a group of messages that are related to each other. Furthermore, the device creates a group of related messages using the thread signatures.