UserX
You might also want to try dry skin brushing. This helps to cleanse and circulate the lymph which may be contributing to your fluid retention. Use a natural sisal brush (available at most health food stores) and brush all areas of the skin towards the heart daily. The brush and your skin should both be dry.
Also, make sure that you are drinking enough water. Low-grade dehydration can contribute to water retention as the body will hold onto whatever fluids it can.