An elbow assembly for use in a respiratory mask, which includes an elbow, an inlet port, an exhaust port, and a baffle separating the inlet port from the exhaust port. A mask assembly includes a cushion comprising at least one gusset and an aperture for connection to the elbow assembly.