Fixed issue #31: message conditions are now honoured again