Fix of mail. Even made something a checkbox