You can drink nettle, dandelion and fennel tea to relieve water retention -up to 2 cups daily (From Susun Weed's herbal for pregnancy and childbirth-she says, go easy on parsley tea, only half a cup daily). Increase potassium intake-eat potatoes cooked in their peels with the peels-organic if possible.
You can mix ginger oil (3 drops), cypress (2 drops) and lavender (2 drops) in 30 ml vegetable oil and massage from ankles to legs, hands to arms and over back for 10 days. Do not use on abdomen (from "The Fragrant Pharmacy")
If you get high blood pressure and protein in the urine, see your doctor.
Get enough protein in your diet, too.
A common homeopathic remedy is natrium muriaticum, you could try a short course and see if it goes away.