diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index 0b15dab12c..459f5cd0fc 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -257,7 +257,7 @@ public interface ContentModel
     
     // AVM workflow defaults
     static final QName TYPE_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowdefaults");
-    static final QName PROP_WORKFLOWNAME = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowname");
+    static final QName PROP_WORKFLOW_ID = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowid");
     static final QName PROP_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "defaults");
     
     // AVM web workflow defaults
diff --git a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
index 15e27d8478..6135214fd7 100644
--- a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -199,17 +200,19 @@ public class MailMetadataExtracter extends AbstractMetadataExtracter
                     if (dateIndex != -1)
                     {
                         dateIndex++;
+                        final Calendar c = Calendar.getInstance();
                         String strYear = date.substring(dateIndex, dateIndex + 2);
-                        int year = Integer.parseInt(strYear) + (2000 - 1900);
+                        c.set(Calendar.YEAR, Integer.parseInt(strYear) + (2000 - 1900));
                         String strMonth = date.substring(dateIndex + 2, dateIndex + 4);
-                        int month = Integer.parseInt(strMonth) - 1;
+                        c.set(Calendar.MONTH, Integer.parseInt(strMonth) - 1);
                         String strDay = date.substring(dateIndex + 4, dateIndex + 6);
-                        int day = Integer.parseInt(strDay);
+                        c.set(Calendar.DAY_OF_MONTH, Integer.parseInt(strDay));
                         String strHour = date.substring(dateIndex + 6, dateIndex + 8);
-                        int hour = Integer.parseInt(strHour);
+                        c.set(Calendar.HOUR, Integer.parseInt(strHour));
                         String strMinute = date.substring(dateIndex + 10, dateIndex + 12);
-                        int minute = Integer.parseInt(strMinute);
-                        destination.put(ContentModel.PROP_SENTDATE, new Date(year, month, day, hour, minute));
+                        c.set(Calendar.MINUTE, Integer.parseInt(strMinute));
+                        c.set(Calendar.SECOND, 0);
+                        destination.put(ContentModel.PROP_SENTDATE, c.getTime());
                     }
                 }
             }