Fixed saving messages when selected