Better handling of the senders / channels listings.