Correctly handle the forward of buffered messages