Help me find this film

[Sirjo]

A romantic drama film from the 80's about a young guy in love with a girl. The guy is killed and goes to heaven. God is portrayed as a short man in a white suit who is always chain-smoking. He sends the dead guy back but he is born as someone else and is given until a certain birthday to find his love or he will die again. A great film but I can't remember the title and it driving me mad!!! Any clues???

[stoo_pid]

Not Heaven Can Wait is it?

[LeMarchand]

Sounds more like "Made in Heaven" ( http://www.imdb.com/title/tt0093467/ ), I thought it was one of the most tedious films I've ever seen! (God - though male - was actually played by Debra Winger).

[LeMarchand]

P.S> I mean God in the movie was male!