Mail manager

Mail Manager update