partition: use "message" instead of "envelope"