Just a suggestion, I have an E-Visa, what have done the past few years is to print it out, fold it up and paper clip it to the second page of my passport.
Doing so makes it quick work to show an airline, and to hand it to immigration. I leave it in my passport until I return to my homeland just in case any questions arise