About tense

One of my friends came to Japan and now she is back in her country.
She is writing me that she will see us again in two years since she wants to go to college in Japan.

Can you tell me which one sounds better??

1)I will be happy to see you again in Tokyo in about two years.

2)I am happy to see you again in Tokyo in about two years.

I feel that if I say 1), then I am talking about the time I actually see her and how I feel when I see her.
So, I'm talking about my feeling in the future. Is it right?

If I say 2) I am talking about the current feeling about going to see her again in the future.
I mean, I am happy because I will see her again in two years, right??

Or do both sound not natural??

Thank you!