Organizing messages into conversation threads

A non-transitory computer readable medium storing program code, the program code when executed by at least one processor cause the at least one processor to implement operations comprising:

• receiving, by a messaging system, a first message corresponding to a first electronic message channel, the first message associated with a set of entities of the messaging system;
• adding the first message to a first conversation thread that is associated with the set of entities and includes a collection of messages sent between the set of entities;
• receiving, by the messaging system, a second message corresponding to a second electronic message channel that is different than the first electronic message channel, the second message also associated with the set of entities;
• adding the second message to the first conversation thread associated with the set of entities;
• and
• generating a message interface corresponding to the first conversation thread for display to an entity of the set of entities, the message interface including:
• content of the first message in association with an icon representing the first electronic message channel;
• and
• content of the second message in association with an icon representing the second electronic message channel.