Index: /trunk/FACT++/src/datalogger.cc
===================================================================
--- /trunk/FACT++/src/datalogger.cc	(revision 16875)
+++ /trunk/FACT++/src/datalogger.cc	(revision 16876)
@@ -1507,7 +1507,24 @@
             Error(err.str());
         }
+
+        bool isMessage = (sub.service == "MESSAGE");
         ostringstream msg;
-        string serviceName = (sub.service == "MESSAGE") ? "" : "_"+sub.service;
-        msg << sub.server << serviceName << ": " << strings[0];
+        string serviceName = isMessage ? "" : "_"+sub.service;
+        msg << sub.server << serviceName;
+
+        //fix the quality of non message "messages"
+        if (!isMessage)
+        {
+            msg << " (" << fQuality << ")";
+            fQuality = kMessage;
+        }
+
+        //special case for alarm reset
+        if (isMessage && (fQuality == kAlarm) && (strings[0] == ""))
+        {
+            fQuality = kInfo;
+            strings[0] = "Alarm reset";
+        }
+        msg << ": " << strings[0];
 
         if (fNightlyLogFile.is_open())