Moving html generation out of Message to MessageWindow

and removing the crypto test