@Sebastian ***********
from what I know there is no e-visa required. I also know that the only rule in this kind of situation is to enter and exit a country with the same passport so the entry and exit stamps are in the same passport. Logically there should be absolutely no issue at all in this kind of situation, especially when travelling by air, but by land, from what I know, the rules may change because of the local "weird" land borders between Thailand and Cambodia...