More refactoring of commonality, also test unroutable mail