Yep, the "Best Alternative" option does bring back the HTML format for the selected message, at least temporarily. It goes away when I come back to it after a while or when I reopen Mail. To make things more confusing I just got one message with rich text displaying properly. It seems to happen...