Added support for generic mail command