And please don't do anything drastic or unusual to try to combat the pre-TOM retention. Diuretics, even "naturals" ones, can be quite dangerous.
I really don't know how long sore musles retain water- I workout some body parts every day, so there is usually some part of me that's sore at any given time. It's really not a lot- but after a good leg workout you may be up a pound or just not show a loss if you're in weight loss mode. You're not getting "fatter", so don't worry about it

Just stay hydrated.
Mel