Fixed email bug with selection