A portable water-pipe for smoking a substance, such as tobacco or the like, comprising: a housing having a mount for holding the substance to be smoked and a chamber for holding water, wherein the chamber is connected in fluid communication with the mount via a first fluid connection (8, 9); and a mouth-piece attached to the housing and connected in fluid communication with the chamber for drawing smoke through the chamber from the substance held by the mount, wherein the first fluid connection (8, 9) is configured to inhibit egress of water from the chamber irrespective of an orientation of the housing;, wherein the first fluid connection (8, 9) has an outlet opening and defines a convoluted or tortuous fluid path between the mount and a lower or bottom region of the chamber, wherein the mouth-piece is connected in fluid communication with the chamber via a second fluid connection, and wherein the second fluid connection is configured to inhibit egress of water from the chamber irrespective of an orientation of the housing, wherein the second fluid connection has a an inlet opening for the smoke in a top region of the chamber and defines a convoluted or tortuous fluid path between the mouth-piece and the top region, characterised in that the water-pipe comprises one or more partition or baffle member which at least partially separates the chamber from the mouth-piece, such that the outlet opening and the inlet opening are arranged on different sides with respect to the partition or baffle member and wherein the partition or baffle member is integrally formed with an end wall of the housing proximate the mouth-piece at the top region of the chamber. a housing having a mount for holding the substance to be smoked and a chamber for holding water, wherein the chamber is connected in fluid communication with the mount via a first fluid connection (8, 9); and a mouth-piece attached to the housing and connected in fluid communication with the chamber for drawing smoke through the chamber from the substance held by the mount, wherein the first fluid connection (8, 9) is configured to inhibit egress of water from the chamber irrespective of an orientation of the housing;, wherein the first fluid connection (8, 9) has an outlet opening and defines a convoluted or tortuous fluid path between the mount and a lower or bottom region of the chamber, wherein the mouth-piece is connected in fluid communication with the chamber via a second fluid connection, and wherein the second fluid connection is configured to inhibit egress of water from the chamber irrespective of an orientation of the housing, wherein the second fluid connection has a an inlet opening for the smoke in a top region of the chamber and defines a convoluted or tortuous fluid path between the mouth-piece and the top region, characterised in that the water-pipe comprises one or more partition or baffle member which at least partially separates the chamber from the mouth-piece, such that the outlet opening and the inlet opening are arranged on different sides with respect to the partition or baffle member and wherein the partition or baffle member is integrally formed with an end wall of the housing proximate the mouth-piece at the top region of the chamber.