A single charged particle has (classically) infinite self energy: that is what you get from integrating the energy density over a spherical volume and letting the volume shrink to zero.
If you now bring in a second charge at a finite nonzero distance from the first one, there is a finite "interaction energy" for this two-charge system -- it is just the work done in bringing the second charge in from infinity to this finite location, in the field created by the first charge. Of course, the self energy of each charge is still infinite.
(You can look upon the infinite self energy of a point charge as the energy required to create a charge out of "free space". We don't know how exactly we could do this, and I don't know if this is really a very good way to look at this idea, but it is at least intuitive classically.)
So to summarize,
1. the total energy of the point charge is the sum of its rest energy (by virtue of its mass) and itself energy (which is infinite).
2. for an uncharged particle, the total energy is just the rest energy.
(Caveat: an uncharged "mass" can be considered consist of equal positive and negative point charges, each of which should -- by the above argument -- have an infinite amount of self energy. We therefore need more justification for point 2.)