Groups in which every non-abelian subgroup is self-centralizing

We study groups having the property that every non-abelian subgroup contains its centralizer. We describe various classes of infinite groups in this class, and address a problem of Berkovich regarding the classification of finite $p$-groups with the above property.
Comment: Referee's comments incorporated