Replace MessageEventArgs by generic EventArgs