Refactored, added mail activity