diff --git a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
index 19b3d63cfc..b0661970a8 100644
--- a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
@@ -34,6 +34,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.apache.poi.poifs.eventfilesystem.POIFSReader;
@@ -62,7 +63,7 @@ public class MailMetadataExtracter extends AbstractMappingMetadataExtracter
     private static final String KEY_ADDRESSEES = "addressees";
     private static final String KEY_SUBJECT = "subjectLine";
 
-    public static String[] SUPPORTED_MIMETYPES = new String[] {"message/rfc822"};
+    public static String[] SUPPORTED_MIMETYPES = new String[] {MimetypeMap.MIMETYPE_OUTLOOK_MSG};
     
     private static final String STREAM_PREFIX = "__substg1.0_";
     private static final int STREAM_PREFIX_LENGTH = STREAM_PREFIX.length();
diff --git a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracterTest.java b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracterTest.java
new file mode 100644
index 0000000000..28b5390eba
--- /dev/null
+++ b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracterTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2005 Jesper Steen Møller
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.repo.content.metadata;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public class MailMetadataExtracterTest extends AbstractMetadataExtracterTest
+{
+    private MailMetadataExtracter extracter;
+
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        extracter = new MailMetadataExtracter();
+        extracter.setDictionaryService(dictionaryService);
+        extracter.register();
+    }
+
+    /**
+     * @return Returns the same transformer regardless - it is allowed
+     */
+    protected MetadataExtracter getExtracter()
+    {
+        return extracter;
+    }
+
+    public void testSupports() throws Exception
+    {
+        for (String mimetype : MailMetadataExtracter.SUPPORTED_MIMETYPES)
+        {
+            boolean supports = extracter.isSupported(mimetype);
+            assertTrue("Mimetype should be supported: " + mimetype, supports);
+        }
+    }
+
+    public void testOutlookMsgExtraction() throws Exception
+    {
+        testExtractFromMimetype(MimetypeMap.MIMETYPE_OUTLOOK_MSG);
+    }
+    
+    protected void testCommonMetadata(String mimetype, Map<QName, Serializable> properties)
+    {
+        assertEquals(
+                "Property " + ContentModel.PROP_AUTHOR + " not found for mimetype " + mimetype,
+                "KEVIN.ROAST@BEN",
+                DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_AUTHOR)));
+        assertEquals(
+                "Property " + ContentModel.PROP_DESCRIPTION + " not found for mimetype " + mimetype,
+                "Test the content transformer",
+                DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_DESCRIPTION)));
+    }
+}