fix for settings

and for removal of messages