Adding email collector. Testing under Apache now...