improve message save&remove