Major be-handle-mail rewrite to make things more modular.