Uploading email - merged folders