Observables involving heavy quarks can be computed in perturbative QCD in two different approximation schemes: either the quark mass dependence is fully retained or retained only where needed to regulate the collinear singularity. The two schemes have distinct advantages and drawbacks. The former allows one to correctly account for the heavy-flavour kinematics, the latter one to resum potentially large mass collinear logarithms. However, it is known that the structure of large logarithms arising from soft emissions is different in the two approaches. We construct a formalism that allows how to consistently resum soft logarithms in both schemes, thus arriving at a description of processes involving heavy quarks that is faithful over a wide kinematic range.