diff --git a/plugins/samplesource/bladerf/bladerfinput.cpp b/plugins/samplesource/bladerf/bladerfinput.cpp
index 10c502f15..8ed9f9224 100644
--- a/plugins/samplesource/bladerf/bladerfinput.cpp
+++ b/plugins/samplesource/bladerf/bladerfinput.cpp
@@ -228,13 +228,10 @@ quint64 BladerfInput::getCenterFrequency() const
 
 bool BladerfInput::handleMessage(const Message& message)
 {
-	qDebug() << "BladerfInput::handleMessage";
-
 	if (MsgConfigureBladerf::match(message))
 	{
-		qDebug() << "  - MsgConfigureBladerf";
-
 		MsgConfigureBladerf& conf = (MsgConfigureBladerf&) message;
+		qDebug() << "BladerfInput::handleMessage: MsgConfigureBladerf";
 
 		if (!applySettings(conf.getSettings(), false))
 		{
diff --git a/sdrbase/dsp/dspengine.cpp b/sdrbase/dsp/dspengine.cpp
index 584728167..b256f3b74 100644
--- a/sdrbase/dsp/dspengine.cpp
+++ b/sdrbase/dsp/dspengine.cpp
@@ -608,13 +608,13 @@ void DSPEngine::handleSynchronousMessages()
 
 void DSPEngine::handleInputMessages()
 {
-	Message* message;
-	int queueSize =  m_inputMessageQueue.size();
+	qDebug() << "DSPEngine::handleInputMessages";
 
-	for (int i = 0; i < queueSize; i++)
+	Message* message;
+
+	while ((message = m_inputMessageQueue.pop()) != 0)
 	{
-		message = m_inputMessageQueue.pop();
-		qDebug() << "DSPEngine::handleInputMessages: " << message->getIdentifier();
+		qDebug("DSPEngine::handleInputMessages: message: %s", message->getIdentifier());
 
 		if (DSPConfigureCorrection::match(*message))
 		{
@@ -636,11 +636,7 @@ void DSPEngine::handleInputMessages()
 				m_imbalance = 65536;
 			}
 
-			delete message; // delete
-		}
-		else
-		{
-			m_inputMessageQueue.push(message); // repush
+			delete message;
 		}
 	}
 }
@@ -648,11 +644,9 @@ void DSPEngine::handleInputMessages()
 void DSPEngine::handleSourceMessages()
 {
 	Message *message;
-	int queueSize =  m_inputMessageQueue.size();
 
-	for (int i = 0; i < queueSize; i++)
+	while ((message = m_sampleSource->getOutputMessageQueue()->pop()) != 0)
 	{
-		message = m_inputMessageQueue.pop();
 		qDebug() << "DSPEngine::handleSourceMessages: " << message->getIdentifier();
 
 		if (DSPSignalNotification::match(*message))
@@ -689,10 +683,6 @@ void DSPEngine::handleSourceMessages()
 
 			delete message;
 		}
-		else
-		{
-			m_inputMessageQueue.push(message);
-		}
 	}
 }
 
diff --git a/sdrbase/dsp/samplesink.cpp b/sdrbase/dsp/samplesink.cpp
index 0aed61735..242c32e83 100644
--- a/sdrbase/dsp/samplesink.cpp
+++ b/sdrbase/dsp/samplesink.cpp
@@ -13,20 +13,13 @@ SampleSink::~SampleSink()
 void SampleSink::handleInputMessages()
 {
 	Message* message;
-	int queueSize = m_inputMessageQueue.size();
 
-	for (int i = 0; i < queueSize; i++)
+	while ((message = m_inputMessageQueue.pop()) != 0)
 	{
-		message = m_inputMessageQueue.pop();
-
 		if (handleMessage(*message))
 		{
 			delete message;
 		}
-		else
-		{
-			m_inputMessageQueue.push(message);
-		}
 	}
 }
 
diff --git a/sdrbase/dsp/samplesource.cpp b/sdrbase/dsp/samplesource.cpp
index ea25c31c0..be4958178 100644
--- a/sdrbase/dsp/samplesource.cpp
+++ b/sdrbase/dsp/samplesource.cpp
@@ -29,19 +29,12 @@ SampleSource::~SampleSource()
 void SampleSource::handleInputMessages()
 {
 	Message* message;
-	int queueSize = m_inputMessageQueue.size();
 
-	for (int i = 0; i < queueSize; i++)
+	while ((message = m_inputMessageQueue.pop()) != 0)
 	{
-		message = m_inputMessageQueue.pop();
-
 		if (handleMessage(*message))
 		{
 			delete message;
 		}
-		else
-		{
-			m_inputMessageQueue.push(message);
-		}
 	}
 }
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index b5cd7ee59..a799172a3 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -332,13 +332,12 @@ void MainWindow::applySettings()
 void MainWindow::handleDSPMessages()
 {
 	Message* message;
-	MessageQueue* messageQueue = m_dspEngine->getOutputMessageQueue();
-	int queueSize =  messageQueue->size();
 
-	for (int i = 0; i < queueSize; i++)
+	while ((message = m_dspEngine->getOutputMessageQueue()->pop()) != 0)
 	{
-		message = messageQueue->pop();
-		qDebug() << "MainWindow::handleDSPMessages: " << message->getIdentifier();
+		qDebug("Message: %s", message->getIdentifier());
+
+		std::cerr << "MainWindow::handleDSPMessages: " << message->getIdentifier() << std::endl;
 
 		if (DSPSignalNotification::match(*message))
 		{
@@ -353,31 +352,22 @@ void MainWindow::handleDSPMessages()
 
 			delete message;
 		}
-		else
-		{
-			messageQueue->push(message);
-		}
 	}
 }
 
 void MainWindow::handleMessages()
 {
 	Message* message;
-	int queueSize =  m_inputMessageQueue.size();
 
-	for (int i = 0; i < queueSize; i++)
+	while ((message = m_inputMessageQueue.pop()) != 0)
 	{
-		message = m_inputMessageQueue.pop();
-		qDebug() << "MainWindow::handleMessages: " << message->getIdentifier();
+		qDebug("Message: %s", message->getIdentifier());
+		std::cerr << "MainWindow::handleMessages: " << message->getIdentifier() << std::endl;
 
-		if (m_pluginManager->handleMessage(*message))
+		if (!m_pluginManager->handleMessage(*message))
 		{
 			delete message;
 		}
-		else
-		{
-			m_inputMessageQueue.push(message);
-		}
 	}
 }