Make message management somewhat more sane.  This is still quite quite quite crufty.