Mail manager

Commiting Mail manager to Master