Fix message listing