Reverted message window class, added messages