Made message marking functional