Fix logic for returning to and yanking from Rmail buffer.