mail delivery engine; workspace refactored