Improve MessageWindowMenu