Wolf – “and when moshiach comes, who will be her husband?
Neither, since her last marriage was terminated by her death or her husbands. Therefore, when she is resurrected, she will be able to marry whichever one she wants (or even someone else entirely).”
No, you need a mekor for the above. If the sefer says Oolam Haba, I doubt there is a difference in Moshiach times.