Swaddling

Melissa • Just tracking my period!
We swaddle my 11 week old at night, and it keeps him secure and sleeping longer. He still flails his arms involuntarily, so we swaddle his arms.
When did you all stop swaddling their arms? I've heard conflicting stuff-- 3 months, when they can roll over? 
I'd love input.