Fixxed some problems with removing messages