Updated/New Composer support for Mail_Queue

See diff for full changes