Index: /trunk/FACT++/src/datalogger.cc
===================================================================
--- /trunk/FACT++/src/datalogger.cc	(revision 14372)
+++ /trunk/FACT++/src/datalogger.cc	(revision 14373)
@@ -1222,5 +1222,6 @@
     {
         //write text header
-        header << sub.server << "_" << sub.service << " " << fQuality << " ";
+        string serviceName = (sub.service == "MESSAGE") ? "" : "_"+sub.service;
+        header << sub.server << serviceName << " " << fQuality << " ";
         header << evt.GetTime() << " ";
 
@@ -1295,5 +1296,6 @@
         }
         ostringstream msg;
-        msg << sub.server << "_" << sub.service << ": " << strings[0];
+        string serviceName = (sub.service == "MESSAGE") ? "" : "_"+sub.service;
+        msg << sub.server << serviceName << ": " << strings[0];
 
         if (fNightlyLogFile.is_open())