diff --git a/pvAccessApp/remoteClient/clientContextImpl.cpp b/pvAccessApp/remoteClient/clientContextImpl.cpp
index 3f19dff..eee235d 100644
--- a/pvAccessApp/remoteClient/clientContextImpl.cpp
+++ b/pvAccessApp/remoteClient/clientContextImpl.cpp
@@ -3270,7 +3270,7 @@ namespace epics {
                     return getChannelName();
                 };
                 
-                virtual void message(String message,MessageType messageType)
+                virtual void message(String const & message,MessageType messageType)
                 {
                     std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
                 }
diff --git a/pvAccessApp/server/baseChannelRequester.cpp b/pvAccessApp/server/baseChannelRequester.cpp
index bca5bf6..928fdb2 100644
--- a/pvAccessApp/server/baseChannelRequester.cpp
+++ b/pvAccessApp/server/baseChannelRequester.cpp
@@ -65,7 +65,7 @@ String BaseChannelRequester::getRequesterName()
 	return name.str();
 }
 
-void BaseChannelRequester::message(const String message, const epics::pvData::MessageType messageType)
+void BaseChannelRequester::message(String const & message, epics::pvData::MessageType messageType)
 {
 	BaseChannelRequester::message(_transport, _ioid, message, messageType);
 }
diff --git a/pvAccessApp/server/baseChannelRequester.h b/pvAccessApp/server/baseChannelRequester.h
index b986d8f..14486e5 100644
--- a/pvAccessApp/server/baseChannelRequester.h
+++ b/pvAccessApp/server/baseChannelRequester.h
@@ -27,7 +27,7 @@ public:
 	void stopRequest();
 	epics::pvData::int32 getPendingRequest();
 	epics::pvData::String getRequesterName();
-	void message(const epics::pvData::String message, const epics::pvData::MessageType messageType);
+	void message(epics::pvData::String const & message, epics::pvData::MessageType messageType);
 	static void message(Transport::shared_pointer const & transport, const pvAccessID ioid, const epics::pvData::String message, const epics::pvData::MessageType messageType);
 	static void sendFailureMessage(const epics::pvData::int8 command, Transport::shared_pointer const & transport, const pvAccessID ioid, const epics::pvData::int8 qos, const epics::pvData::Status status);
 
diff --git a/pvAccessApp/server/responseHandlers.cpp b/pvAccessApp/server/responseHandlers.cpp
index 1e9c588..4e91b3f 100644
--- a/pvAccessApp/server/responseHandlers.cpp
+++ b/pvAccessApp/server/responseHandlers.cpp
@@ -423,7 +423,7 @@ String ServerChannelRequesterImpl::getRequesterName()
 	return name.str();
 }
 
-void ServerChannelRequesterImpl::message(const String message, const MessageType messageType)
+void ServerChannelRequesterImpl::message(String const & message, MessageType messageType)
 {
 	LOG(logLevelDebug, "[%s] %s", getMessageTypeName(messageType).c_str(), message.c_str());
 }
diff --git a/pvAccessApp/server/responseHandlers.h b/pvAccessApp/server/responseHandlers.h
index 3173a65..f824a09 100644
--- a/pvAccessApp/server/responseHandlers.h
+++ b/pvAccessApp/server/responseHandlers.h
@@ -230,7 +230,7 @@ namespace pvAccess {
         	 void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer const & channel);
         	 void channelStateChange(Channel::shared_pointer const & c, const Channel::ConnectionState isConnected);
         	 epics::pvData::String getRequesterName();
-        	 void message(const epics::pvData::String message, const epics::pvData::MessageType messageType);
+        	 void message(epics::pvData::String const & message, epics::pvData::MessageType messageType);
         	 void lock();
         	 void unlock();
         	 void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
diff --git a/testApp/client/MockClientImpl.cpp b/testApp/client/MockClientImpl.cpp
index 7e543ed..ea36214 100644
--- a/testApp/client/MockClientImpl.cpp
+++ b/testApp/client/MockClientImpl.cpp
@@ -420,7 +420,7 @@ class MockChannel : public Channel {
         return getChannelName();
     };
     
-    virtual void message(String message,MessageType messageType) 
+    virtual void message(String const & message,MessageType messageType) 
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
@@ -700,7 +700,7 @@ class ChannelRequesterImpl : public ChannelRequester
         return "ChannelRequesterImpl";
     };
     
-    virtual void message(String message,MessageType messageType) 
+    virtual void message(String const & message,MessageType messageType) 
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
@@ -724,7 +724,7 @@ class GetFieldRequesterImpl : public GetFieldRequester
         return "GetFieldRequesterImpl";
     };
     
-    virtual void message(String message,MessageType messageType) 
+    virtual void message(String const & message,MessageType messageType) 
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
@@ -755,7 +755,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         return "ChannelGetRequesterImpl";
     };
     
-    virtual void message(String message,MessageType messageType) 
+    virtual void message(String const & message,MessageType messageType) 
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
@@ -792,7 +792,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
         return "ChannelPutRequesterImpl";
     };
     
-    virtual void message(String message,MessageType messageType) 
+    virtual void message(String const & message,MessageType messageType) 
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
@@ -836,7 +836,7 @@ class MonitorRequesterImpl : public MonitorRequester
         return "MonitorRequesterImpl";
     };
     
-    virtual void message(String message,MessageType messageType) 
+    virtual void message(String const & message,MessageType messageType) 
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
@@ -885,7 +885,7 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
         return "ProcessRequesterImpl";
     };
     
-    virtual void message(String message,MessageType messageType) 
+    virtual void message(String const & message,MessageType messageType) 
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
diff --git a/testApp/client/testCreateRequest.cpp b/testApp/client/testCreateRequest.cpp
index 0768de4..f02d320 100644
--- a/testApp/client/testCreateRequest.cpp
+++ b/testApp/client/testCreateRequest.cpp
@@ -25,7 +25,7 @@ public:
         return "RequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
diff --git a/testApp/remote/eget.cpp b/testApp/remote/eget.cpp
index b871653..a188eef 100644
--- a/testApp/remote/eget.cpp
+++ b/testApp/remote/eget.cpp
@@ -32,7 +32,7 @@ public:
         return "RequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -527,7 +527,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         return "ChannelGetRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -629,7 +629,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
         return "ChannelRPCRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -732,7 +732,7 @@ public:
         return "ChannelRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
diff --git a/testApp/remote/pvget.cpp b/testApp/remote/pvget.cpp
index 4e8fa7c..ca3d966 100644
--- a/testApp/remote/pvget.cpp
+++ b/testApp/remote/pvget.cpp
@@ -37,7 +37,7 @@ public:
         return "RequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -386,7 +386,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         return "ChannelGetRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -487,7 +487,7 @@ class MonitorRequesterImpl : public MonitorRequester
         return "MonitorRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -569,7 +569,7 @@ public:
         return "ChannelRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
diff --git a/testApp/remote/pvput.cpp b/testApp/remote/pvput.cpp
index 48a610b..e6baa82 100644
--- a/testApp/remote/pvput.cpp
+++ b/testApp/remote/pvput.cpp
@@ -33,7 +33,7 @@ public:
         return "RequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -381,7 +381,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
         return "ChannelPutRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -488,7 +488,7 @@ public:
         return "ChannelRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
diff --git a/testApp/remote/pvrpc.cpp b/testApp/remote/pvrpc.cpp
index 09020ac..b9ae493 100644
--- a/testApp/remote/pvrpc.cpp
+++ b/testApp/remote/pvrpc.cpp
@@ -38,7 +38,7 @@ public:
         return "RequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -85,7 +85,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
         return "ChannelRPCRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -113,7 +113,7 @@ public:
         return "ChannelRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
diff --git a/testApp/remote/testChannelConnect.cpp b/testApp/remote/testChannelConnect.cpp
index 1c8f2c7..b1d42d3 100644
--- a/testApp/remote/testChannelConnect.cpp
+++ b/testApp/remote/testChannelConnect.cpp
@@ -30,7 +30,7 @@ private:
         return "ChannelRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
diff --git a/testApp/remote/testGetPerformance.cpp b/testApp/remote/testGetPerformance.cpp
index f2250a4..fb7b01d 100644
--- a/testApp/remote/testGetPerformance.cpp
+++ b/testApp/remote/testGetPerformance.cpp
@@ -45,7 +45,7 @@ public:
         return "RequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -104,7 +104,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
        return "ChannelGetRequesterImpl";
    };
 
-   virtual void message(String message,MessageType messageType)
+   virtual void message(String const & message,MessageType messageType)
    {
        std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
    }
@@ -219,7 +219,7 @@ public:
        return "ChannelRequesterImpl";
    };
 
-   virtual void message(String message,MessageType messageType)
+   virtual void message(String const & message,MessageType messageType)
    {
        std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
    }
diff --git a/testApp/remote/testRemoteClientImpl.cpp b/testApp/remote/testRemoteClientImpl.cpp
index 3f89c04..f63b560 100644
--- a/testApp/remote/testRemoteClientImpl.cpp
+++ b/testApp/remote/testRemoteClientImpl.cpp
@@ -29,7 +29,7 @@ class ChannelRequesterImpl : public ChannelRequester
         return "ChannelRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -53,7 +53,7 @@ class GetFieldRequesterImpl : public GetFieldRequester
         return "GetFieldRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -88,7 +88,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         return "ChannelGetRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -138,7 +138,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
         return "ChannelPutRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -194,7 +194,7 @@ class ChannelPutGetRequesterImpl : public ChannelPutGetRequester
         return "ChannelGetPutRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -272,7 +272,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
         return "ChannelRPCRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -311,7 +311,7 @@ class ChannelArrayRequesterImpl : public ChannelArrayRequester
         return "ChannelArrayRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -361,7 +361,7 @@ class MonitorRequesterImpl : public MonitorRequester
         return "MonitorRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -410,7 +410,7 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
         return "ProcessRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index cd60a25..f953c8d 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -837,7 +837,7 @@ class MockChannel : public Channel {
         return getChannelName();
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -1091,7 +1091,7 @@ class ChannelRequesterImpl : public ChannelRequester
         return "ChannelRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -1115,7 +1115,7 @@ class GetFieldRequesterImpl : public GetFieldRequester
         return "GetFieldRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -1146,7 +1146,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
         return "ChannelGetRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -1182,7 +1182,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
         return "ChannelPutRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -1225,7 +1225,7 @@ class MonitorRequesterImpl : public MonitorRequester
         return "MonitorRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }
@@ -1274,7 +1274,7 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
         return "ProcessRequesterImpl";
     };
 
-    virtual void message(String message,MessageType messageType)
+    virtual void message(String const & message,MessageType messageType)
     {
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
     }