Fix message marking