diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index b17b4b5065..e61abccaee 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -84,7 +84,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
       TTilesCollection tiles = m_requestedTiles->GetTiles();
       if (!tiles.empty())
       {
-        ScreenBase screen = m_requestedTiles->GetScreen();
+        ScreenBase const screen = m_requestedTiles->GetScreen();
         m_readManager->UpdateCoverage(screen, tiles, m_texMng);
 
         gui::CountryStatusHelper & helper = gui::DrapeGui::Instance().GetCountryStatusHelper();
diff --git a/drape_frontend/message_acceptor.cpp b/drape_frontend/message_acceptor.cpp
index 21fb3dba7c..77b9b7a864 100644
--- a/drape_frontend/message_acceptor.cpp
+++ b/drape_frontend/message_acceptor.cpp
@@ -45,14 +45,18 @@ bool MessageAcceptor::IsInInfinityWaiting() const
   return m_infinityWaiting;
 }
 
+#ifdef DEBUG_MESSAGE_QUEUE
+
 bool MessageAcceptor::IsQueueEmpty() const
 {
   return m_messageQueue.IsEmpty();
 }
 
-bool MessageAcceptor::GetQueueSize() const
+size_t MessageAcceptor::GetQueueSize() const
 {
   return m_messageQueue.GetSize();
 }
 
+#endif
+
 } // namespace df
diff --git a/drape_frontend/message_acceptor.hpp b/drape_frontend/message_acceptor.hpp
index a63cd1d7f2..2b45dada5b 100644
--- a/drape_frontend/message_acceptor.hpp
+++ b/drape_frontend/message_acceptor.hpp
@@ -28,8 +28,11 @@ protected:
   void CloseQueue();
 
   bool IsInInfinityWaiting() const;
+
+#ifdef DEBUG_MESSAGE_QUEUE
   bool IsQueueEmpty() const;
-  bool GetQueueSize() const;
+  size_t GetQueueSize() const;
+#endif
 
 private:
   friend class ThreadsCommutator;
diff --git a/drape_frontend/message_queue.cpp b/drape_frontend/message_queue.cpp
index d661d17737..eb8581a40b 100644
--- a/drape_frontend/message_queue.cpp
+++ b/drape_frontend/message_queue.cpp
@@ -60,6 +60,8 @@ void MessageQueue::PushMessage(drape_ptr<Message> && message, MessagePriority pr
   CancelWaitImpl();
 }
 
+#ifdef DEBUG_MESSAGE_QUEUE
+
 bool MessageQueue::IsEmpty() const
 {
   lock_guard<mutex> lock(m_mutex);
@@ -72,6 +74,8 @@ size_t MessageQueue::GetSize() const
   return m_messages.size();
 }
 
+#endif
+
 void MessageQueue::CancelWait()
 {
   lock_guard<mutex> lock(m_mutex);
diff --git a/drape_frontend/message_queue.hpp b/drape_frontend/message_queue.hpp
index dee9cd1b7d..c4aa9ada02 100644
--- a/drape_frontend/message_queue.hpp
+++ b/drape_frontend/message_queue.hpp
@@ -13,6 +13,8 @@
 namespace df
 {
 
+//#define DEBUG_MESSAGE_QUEUE
+
 class MessageQueue
 {
 public:
@@ -24,8 +26,11 @@ public:
   void PushMessage(drape_ptr<Message> && message, MessagePriority priority);
   void CancelWait();
   void ClearQuery();
+
+#ifdef DEBUG_MESSAGE_QUEUE
   bool IsEmpty() const;
   size_t GetSize() const;
+#endif
 
 private:
   void CancelWaitImpl();