Revert "mail command quirks"

This reverts commit 2f3de4ed5a2ae8767828275c480c65c57fe02534.