Fix Fling + Gem

I also added a check for mails.
I haven't testet it yet, but it should work fine.