emacs: revamp mail hierarchy