Changed all self.messages.waitForReceivedMsgInThisThread to use defaul timeout (much longer!).