Maybe not a cure, but it helps a ton for a few hours!
Eat a whole cucumber. Seriously! It sucks, but works. It is a natural diuretic and will help uou get rid of that water retention. Watermelon does the same thing.
My MW suggested it.
Warning
No formatter is installed for the format bbhtml