Add mail sender and clean up directories