diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index e321bf7507..bb74a675bf 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -520,6 +520,22 @@
    <bean id="transformer.OutlookMsg"
          class="org.alfresco.repo.content.transform.MailContentTransformer"
          parent="baseContentTransformer" />
+         
+   <bean id="transformer.complex.OutlookMsg2Image" 
+        class="org.alfresco.repo.content.transform.ComplexContentTransformer" 
+        parent="baseContentTransformer" > 
+      <property name="transformers"> 
+         <list> 
+            <ref bean="transformer.OutlookMsg" /> 
+            <ref bean="transformer.complex.Text.Image" /> 
+         </list> 
+      </property> 
+      <property name="intermediateMimetypes"> 
+         <list> 
+            <value>text/plain</value> 
+         </list> 
+      </property> 
+   </bean> 
 
    <bean id="transformer.RFC822"
          class="org.alfresco.repo.content.transform.EMLTransformer"
diff --git a/config/alfresco/swf-transform-context.xml b/config/alfresco/swf-transform-context.xml
index 156b2a3991..5deb5ad6c3 100644
--- a/config/alfresco/swf-transform-context.xml
+++ b/config/alfresco/swf-transform-context.xml
@@ -80,5 +80,24 @@
          </map>
       </property>
    </bean>
+   
+   <!-- This transformer allows for the webpreviewing of outlook msg files. --> 
+   <bean id="transformer.complex.Msg2swf" 
+        class="org.alfresco.repo.content.transform.ComplexContentTransformer" 
+        parent="baseContentTransformer" > 
+      <property name="transformers"> 
+         <list> 
+            <ref bean="transformer.OutlookMsg" /> 
+            <ref bean="transformer.PdfBox.TextToPdf" /> 
+            <ref bean="transformer.Pdf2swf" /> 
+         </list> 
+      </property> 
+      <property name="intermediateMimetypes"> 
+         <list> 
+            <value>text/plain</value> 
+            <value>application/pdf</value> 
+         </list> 
+      </property> 
+   </bean> 
 
 </beans>
diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java b/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java
index 93d0e84d20..870e819ccf 100644
--- a/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java
+++ b/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java
@@ -140,6 +140,8 @@ public class DictionaryModelType implements ContentServicePolicies.OnContentUpda
         
     private List<String> storeUrls; // stores against which model deletes should be validated
     
+    /** Validation marker */
+    private boolean doValidation = true;
     
     /**
      * Set the dictionary DAO
@@ -239,6 +241,10 @@ public class DictionaryModelType implements ContentServicePolicies.OnContentUpda
         this.storeUrls = storeUrls;
     }
     
+    public void setDoValidation(boolean doValidation)
+    {
+    	this.doValidation = doValidation;
+    }    
     
     /**
      * The initialise method
@@ -676,7 +682,10 @@ public class DictionaryModelType implements ContentServicePolicies.OnContentUpda
                                         nodeService.setProperties(nodeRef, props);
                                         
                                         // Validate model against dictionary - could be new, unchanged or updated
-                                        validateModel(modelDefinition.getName(), m2Model, compiledModel);
+                                        if (doValidation == true)
+                                        {
+                                        	validateModel(modelDefinition.getName(), m2Model, compiledModel);
+                                        }
                                         
                                         // invalidate - to force lazy re-init
                                         //dictionaryDAO.destroy();