tweaked message TO/FROM format a little, looking for bugs and improvements to make