Plus some other adjustements Fix #20 Unfortunatly, it's not sufficient, as gmail still often tags invitations as spam :-( but still a bit better