Jon: added 'MessageWindow' and removed extra files'