This concept of matter may be generalized from atoms to include any objects having mass even when at rest, but this is ill-defined because an object's mass can arise from its (possibly massless) constituents' motion and interaction energies.
Prior to the 20th century, the definition of matter included any object that had mass even when it was in what state? 
at rest