Fixed bug in Email, Fixed possible bug in csv import