fixing message save
merge with keenan