Move messageQueue to EventRelay