+ fixed several m_message issues
+ no idea how many bugs did I introduce, or even if it compiles,
  be welcome to review.