Hymns of hope (3) It is well with my soul

Horatio Spafford's moving hymn, When peace, like a river, is somewhat marred by a line in a verse that apparently was not in the original version or even the original (?) published version:

But, Lord, ’tis for Thee, for Thy coming we wait,
The sky, not the grave, is our goal;
Oh, trump of the angel! Oh, voice of the Lord!
Blessed hope, blessed rest of my soul!

(I'd be interested to know where that verse came from: leave a comment below if you know.)

I’ve taken to singing “The earth, not the grave is our goal”, because the Christian hope is ultimately not to stay in heaven (the sky?) for ever, but for the Lord to return, for the dead to be restored to bodily life, and for the meek to inherit… the sky?

But perhaps better would be to miss out that verse altogether, and to stick with Spafford's final verse, which is much richer:

And Lord, haste the day when my faith shall be sight,
The clouds be rolled back as a scroll;
The trump shall resound, and the Lord shall descend,
Even so, it is well with my soul.