diff --git a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java
index 7dee659984..addf555098 100644
--- a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java
+++ b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java
@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.content.metadata;
 
+import java.io.File;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.text.DateFormat;
@@ -28,6 +29,7 @@ import java.util.Set;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
 
@@ -119,6 +121,13 @@ public class RFC822MetadataExtracterTest extends AbstractMetadataExtracterTest
     {
         testExtractFromMimetype(MimetypeMap.MIMETYPE_RFC822);
     }
+    
+    public void testSpanishEmailExtraction() throws Exception
+    {
+        File spanishEml = AbstractContentTransformerTest.loadNamedQuickTestFile("quick.spanish.eml");
+        Map<QName, Serializable> properties = extractFromFile(spanishEml, MimetypeMap.MIMETYPE_RFC822);
+        testCommonMetadata(MimetypeMap.MIMETYPE_RFC822, properties);
+    }
 
     /**
      * We have no author, and have the same title and description
diff --git a/source/test-resources/quick/quick.spanish.eml b/source/test-resources/quick/quick.spanish.eml
index 0cc1a72707..c2f7bed762 100644
--- a/source/test-resources/quick/quick.spanish.eml
+++ b/source/test-resources/quick/quick.spanish.eml
@@ -3,9 +3,9 @@ Received: by 10.000.0.000 with HTTP; Thu, 16 Aug 2012 08:13:29 -0700 (PDT)
 Date: Thu, 16 Aug 2012 16:13:29 +0100
 Delivered-To: jane.doe@alfresco.com
 Message-ID: <CAL0uq1f9vPczLRinL3xB5U_oSSd5U0ob=408nBgosCY0OVFyBw@mail.alfresco.com>
-Subject: quick test
-From: john.doe@alfresco.com>
-To: jane.doe@alfresco.com>
+Subject: The quick brown fox jumps over the lazy dog
+From: <john.doe@alfresco.com>
+To: <jane.doe@alfresco.com>
 Content-Type: multipart/alternative; 
 
 El rápido zorro marrón salta sobre el perro perezoso