Correct message receiver updating