see our own replies in thread, other mutt fixes