Working on message send bug - group window later