Uploading email - clash handling