diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 54a7794934..834f078672 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -200,7 +200,15 @@
    <bean id="extracter.Html"          class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter"          parent="baseMetadataExtracter" />
    <bean id="extracter.MP3"           class="org.alfresco.repo.content.metadata.MP3MetadataExtracter"           parent="baseMetadataExtracter" />
    <bean id="extracter.OpenDocument"  class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter"  parent="baseMetadataExtracter" />
-   <bean id="extracter.RFC822"        class="org.alfresco.repo.content.metadata.RFC822MetadataExtracter"        parent="baseMetadataExtracter" />
+   
+   <bean id="extracter.RFC822"        class="org.alfresco.repo.content.metadata.RFC822MetadataExtracter"        parent="baseMetadataExtracter" >
+      <property name="supportedDateFormats">
+         <list>
+            <value>EEE, d MMM yyyy HH:mm:ss Z</value>
+         </list>
+      </property>
+   </bean>
+   
    <bean id="extracter.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter">
       <property name="worker">
          <ref bean="extracter.worker.OpenOffice" />
diff --git a/config/alfresco/model/imapModel.xml b/config/alfresco/model/imapModel.xml
index 57dab7b258..2d7270c625 100755
--- a/config/alfresco/model/imapModel.xml
+++ b/config/alfresco/model/imapModel.xml
@@ -70,6 +70,16 @@
             <property name="imap:threadIndex">
                <type>d:text</type>
             </property>
+            <property name="imap:dateReceived">
+               <title>Date Received</title>
+               <type>d:date</type>
+               <mandatory>false</mandatory>
+            </property>
+            <property name="imap:dateSent">
+               <title>Date Received</title>
+               <type>d:date</type>
+               <mandatory>false</mandatory>
+            </property>
          </properties>
          <associations>
             <association name="imap:attachment">
diff --git a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
index 1bb2d0be63..180802399b 100644
--- a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
@@ -747,6 +747,10 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
                     {
                         convertedPropertyValue = makeDate((String) propertyValue);
                     }
+                    else if(propertyValue instanceof Date)
+                    {
+                        convertedPropertyValue = propertyValue;
+                    }
                 }
                 else
                 {
diff --git a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
index db0b12c8e5..36ed2b6909 100755
--- a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
@@ -51,9 +51,11 @@ import org.alfresco.service.namespace.QName;
  *   <b>messageTo:</b>                --      imap:messageTo
  *   <b>messageCc:</b>                --      imap:messageCc
  *   <b>messageSubject:</b>           --      imap:messageSubject, cm:title, cm:description
+ *   <b>messageSent:</b>              --      imap:dateSent
  *   <b>All <code>{@link Header#getName() header names}:</b>
  *      <b>Thread-Index:</b>          --      imap:threadIndex
  *      <b>Message-ID:</b>            --      imap:messageId
+ *      <b>date:</b>                  --      imap:dateReceived
  * 
  * @author Derek Hulley
  * @since 3.2
@@ -65,6 +67,7 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
     private static final String KEY_MESSAGE_TO = "messageTo";
     private static final String KEY_MESSAGE_CC = "messageCc";
     private static final String KEY_MESSAGE_SUBJECT = "messageSubject";
+    private static final String KEY_MESSAGE_SENT = "messageSent";
 
     public static String[] SUPPORTED_MIMETYPES = new String[] { MimetypeMap.MIMETYPE_RFC822 };
 
@@ -90,6 +93,7 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
                 putRawValue(KEY_MESSAGE_FROM, InternetAddress.toString(mimeMessage.getFrom()), rawProperties);
                 putRawValue(KEY_MESSAGE_TO, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.TO)), rawProperties);
                 putRawValue(KEY_MESSAGE_CC, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.CC)), rawProperties);
+                putRawValue(KEY_MESSAGE_SENT, mimeMessage.getSentDate(), rawProperties); 
 
                 String[] subj = mimeMessage.getHeader("Subject");
                 if (subj != null && subj.length > 0)
diff --git a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
index d85dec9640..e8e4e9b401 100755
--- a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
+++ b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
@@ -13,7 +13,10 @@ messageFrom=imap:messageFrom
 messageTo=imap:messageTo
 messageCc=imap:messageCc
 messageSubject=imap:messageSubject, cm:title, cm:description
+messageSent=imap:dateSent
+
 
 #Add here any values you want to extract. Use Header name for key.
 Thread-Index=imap:threadIndex
-Message-ID=imap:messageId
\ No newline at end of file
+Message-ID=imap:messageId
+Date=imap:dateReceived
\ No newline at end of file