Merge retry-mail and enqueue

enqueue instead learned the 'retry' command.