Fixed email handler :D