Fixed email export