word choice - Passive voice - I or me?

I know this is incorrect:
John and me will be giving a birthday treat.

I know this is correct:
John and I will be giving a birthday treat.

But what when the voice is changed?

Birthday treat from John and I?
Birthday treat from John and me?