Re: systray rewrite part 2