Mail Controller Reorganization