moved own message check in the correct place