fixed email bugs -fully works