Harmonizes usage of message_id and queue_id
Removed list.c module and replaced list_contains with in operator