Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r1220 -r1388
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1220)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 1388)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.Standard.Logging;
 using Deltares.DamEngine.Io.XmlOutput;
 
 namespace Deltares.DamEngine.Interface
@@ -55,13 +56,12 @@
                 Results = new OutputResults
                 {
                     // Calculation messages
-                    // Were do these come from?
-                    CalculationMessages = new Message[0],
+                    CalculationMessages = new Message[damProjectData.CalculationMessages.Count],
                     // Actual results
                     CalculationResults = new CalculationResults()
                 }
             };
-            
+            CreateCalculationMessages(damProjectData, output);
             CreateDesignResultsOutput(damProjectData, output);
             CreateLocationResultsOutput(damProjectData, output);
             return output;
@@ -100,6 +100,10 @@
                     designResultCount++;
                 }
             }
+        }
+
+        private static void CreateCalculationMessages(DamProjectData damProjectData, Output output)
+        {
             var calculationMessages = damProjectData.CalculationMessages;
             if (calculationMessages != null)
             {
@@ -108,9 +112,16 @@
                 {
                     var message = new Message
                     {
-                        MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType),
-                        Message1 = calculationMessages[i].Message
+                        MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType)                        
                     };
+                    if (calculationMessages[i].Subject != null)
+                    {
+                        message.Message1 = calculationMessages[i].Subject + ": " + calculationMessages[i].Message;
+                    }
+                    else
+                    {
+                        message.Message1 = calculationMessages[i].Message;
+                    }
                     output.Results.CalculationMessages[i] = message;
                 }
             }