From 2397fa50a34fb930dd8da0537fd490f325e3a348 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Mon, 6 Jun 2011 12:59:26 +0000
Subject: [PATCH] MERGE V3.4-BUG-FIX to HEAD   26951 : ALF-8784 - IMAP emails
 point to explorer.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../bootstrap/imapSpacesTemplates.acp         | Bin 0 -> 20953 bytes
 config/alfresco/import-export-context.xml     |   4 +-
 .../messages/patch-service.properties         |   3 +
 .../alfresco/patch/patch-services-context.xml |  58 +++++++
 .../templates/imap/share_messages.xml         |  67 ++++++++
 config/alfresco/version.properties            |   2 +-
 .../patch/impl/ClearOldImapMessgesPatch.java  | 137 ++++++++++++++++
 .../impl/ClearOldImapTemplatesPatch2.java     | 152 ++++++++++++++++++
 .../repo/imap/AbstractMimeMessage.java        |  47 +++++-
 .../alfresco/repo/imap/AlfrescoImapConst.java |   8 +-
 .../repo/imap/ContentModelMessage.java        |  20 ++-
 .../org/alfresco/repo/imap/ImapService.java   |  42 +++--
 .../alfresco/repo/imap/ImapServiceImpl.java   |  57 +++++--
 13 files changed, 565 insertions(+), 32 deletions(-)
 create mode 100644 config/alfresco/bootstrap/imapSpacesTemplates.acp
 create mode 100644 config/alfresco/templates/imap/share_messages.xml
 create mode 100644 source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapMessgesPatch.java
 create mode 100644 source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapTemplatesPatch2.java

diff --git a/config/alfresco/bootstrap/imapSpacesTemplates.acp b/config/alfresco/bootstrap/imapSpacesTemplates.acp
new file mode 100644
index 0000000000000000000000000000000000000000..13153c04a008a6a8ad35335591dd83548059fc1c
GIT binary patch
literal 20953
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
KCy?O*;sF4lyaWIM

literal 0
HcmV?d00001

diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index fe7e53e40f..5b40577104 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -651,11 +651,11 @@
                     <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
                </props>
 
-               <!-- imapSpacesLocales.acp depends on the above imapSpaces.acp being bootstrapped as it imports
+               <!-- imapSpacesTemplates.acp depends on the above imapSpaces.acp being bootstrapped as it imports
                     into folders defined in that acp.  -->
                <props>
                     <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.imapConfig.childname}/${spaces.imap_templates.childname}</prop>
-                    <prop key="location">alfresco/bootstrap/imapSpacesLocales.acp</prop>
+                    <prop key="location">alfresco/bootstrap/imapSpacesTemplates.acp</prop>
                     <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
                </props>
 
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 4c25b11f7e..6141b06c23 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -185,6 +185,9 @@ patch.webscripts.description=Adds Web Scripts to Data Dictionary.
 patch.webscripts2.description=Adds Web Scripts (second set) to Data Dictionary.
 patch.webscripts3.description=Update Web Scripts ReadMe.
 patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
+patch.imap.messages.share.description=Adds email template for txt files to the Imap Configs/Templates
+patch.imap.clear.old.messages.description=Remove old IMAP message templates
+patch.imap.clear.old.messages.description.cleared=Old IMAP message templates no more exists in repo
 
 patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
 patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index a467261b60..e7a8e2365e 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2798,4 +2798,62 @@
         </property>
     </bean>
        
+     <bean id="patch.imap.messages.share" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.imap.messages.share</value></property>
+        <property name="description"><value>patch.imap.messages.share.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>4202</value></property>
+        <property name="targetSchema"><value>4203</value></property>
+        <!-- bootstrap view -->
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.imapConfig.childname}/${spaces.imap_templates.childname}</prop>
+                <prop key="location">alfresco/templates/imap/share_messages.xml</prop>
+            </props>
+        </property>
+    </bean>
+    
+    <bean id="patch.imap.clear.old.messages" class="org.alfresco.repo.admin.patch.impl.ClearOldImapMessgesPatch" parent="basePatch" >
+        <property name="id"><value>patch.imap.clear.old.messages</value></property>
+        <property name="description"><value>patch.imap.clear.old.messages.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>4202</value></property>
+        <property name="targetSchema"><value>4203</value></property>
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>     
+    </bean> 
+	
+    <bean id="patch.imap.clear.old.templates2" class="org.alfresco.repo.admin.patch.impl.ClearOldImapTemplatesPatch2" parent="basePatch" >
+        <property name="id"><value>patch.imap.clear.old.messages</value></property>
+        <property name="description"><value>patch.imap.clear.old.messages.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>5000</value></property>
+        <property name="targetSchema"><value>5001</value></property>
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>     
+    </bean> 
+    
+    <bean id="patch.imapSpacesTemplates2" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.imapSpacesLocaleTemplates</value></property>
+        <property name="description"><value>patch.imapSpacesLocaleTemplates.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>5000</value></property>
+        <property name="targetSchema"><value>5001</value></property>
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.imapConfig.childname}/${spaces.imap_templates.childname}</prop>
+                <prop key="location">alfresco/bootstrap/imapSpacesTemplates.acp</prop>
+                <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
+            </props>
+        </property>
+    </bean>
+       
 </beans>
diff --git a/config/alfresco/templates/imap/share_messages.xml b/config/alfresco/templates/imap/share_messages.xml
new file mode 100644
index 0000000000..52dbafd4e2
--- /dev/null
+++ b/config/alfresco/templates/imap/share_messages.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
+    <cm:content view:childName="cm:emailbody-share-textplain.ftl" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0">
+        <view:aspects>
+            <cm:titled></cm:titled>
+            <cm:author></cm:author>
+            <app:inlineeditable></app:inlineeditable>
+        </view:aspects>
+        <view:properties>
+            <app:editInline>true</app:editInline>
+            <cm:description>Email template used to generate the "multipart/alternative" IMAP message body ("text/plain" part) for documents in Sites.</cm:description>
+            <cm:content>contentUrl=classpath:alfresco/templates/imap/imap_message_text_plain_share.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_</cm:content>
+            <cm:title>emailbody-share-textplain.ftl</cm:title>
+            <cm:author></cm:author>
+            <cm:name>emailbody-share-textplain.ftl</cm:name>
+        </view:properties>
+        <view:associations></view:associations>
+    </cm:content>
+    <cm:content view:childName="cm:emailbody-share-texthtml.ftl" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0">
+        <view:aspects>
+            <cm:titled></cm:titled>
+            <cm:author></cm:author>
+            <app:inlineeditable></app:inlineeditable>
+        </view:aspects>
+        <view:properties>
+            <app:editInline>true</app:editInline>
+            <cm:description>Email template used to generate the "multipart/alternative" IMAP message body ("text/html" part) for documents in Sites</cm:description>
+            <cm:content>contentUrl=classpath:alfresco/templates/imap/imap_message_text_html_share.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_</cm:content>
+            <cm:title>emailbody-share-texthtml.ftl</cm:title>
+            <cm:author></cm:author>
+            <cm:name>emailbody-share-texthtml.ftl</cm:name>
+        </view:properties>
+        <view:associations></view:associations>
+    </cm:content>
+    <cm:content view:childName="cm:emailbody-alfresco-textplain.ftl"  xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0">
+        <view:aspects>
+            <cm:titled></cm:titled>
+            <cm:author></cm:author>
+            <app:inlineeditable></app:inlineeditable>
+        </view:aspects>
+        <view:properties>
+            <app:editInline>true</app:editInline>
+            <cm:description>Email template used to generate the "multipart/alternative" IMAP message body ("text/plain" part) for documents in Alfresco</cm:description>
+            <cm:content>contentUrl=classpath:alfresco/templates/imap/imap_message_text_plain_alfresco.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_</cm:content>
+            <cm:title>emailbody-alfresco-textplain.ftl</cm:title>
+            <cm:author></cm:author>
+            <cm:name>emailbody-alfresco-textplain.ftl</cm:name>
+        </view:properties>
+        <view:associations></view:associations>
+    </cm:content>
+    <cm:content view:childName="cm:emailbody-alfresco-texthtml.ftl"  xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0">
+        <view:aspects>
+            <cm:titled></cm:titled>
+            <cm:author></cm:author>
+            <app:inlineeditable></app:inlineeditable>
+        </view:aspects>
+        <view:properties>
+            <app:editInline>true</app:editInline>
+            <cm:description>Email template used to generate the "multipart/alternative" IMAP message body ("text/html" part) for documents in Alfresco</cm:description>
+            <cm:content>contentUrl=classpath:alfresco/templates/imap/imap_message_text_html_alfresco.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_</cm:content>
+            <cm:title>emailbody-alfresco-texthtml.ftl</cm:title>
+            <cm:author></cm:author>
+            <cm:name>emailbody-alfresco-texthtml.ftl</cm:name>
+        </view:properties>
+        <view:associations></view:associations>
+    </cm:content>	
+</view:view>
\ No newline at end of file
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 4af5a9f6a4..644ba66be7 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=5000
+version.schema=5001
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapMessgesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapMessgesPatch.java
new file mode 100644
index 0000000000..ec85a34738
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapMessgesPatch.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.importer.ImporterBootstrap;
+import org.alfresco.service.cmr.admin.PatchException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+public class ClearOldImapMessgesPatch extends AbstractPatch
+{
+    private static final String MSG_REMOVED = "patch.imap.clear.old.messages.description.cleared";
+    
+    private static final String PROPERTY_COMPANY_HOME_CHILDNAME = "spaces.company_home.childname";
+    private static final String PROPERTY_DICTIONARY_CHILDNAME = "spaces.dictionary.childname";
+    private static final String PROPERTY_SCRIPTS_CHILDNAME = "spaces.scripts.childname";
+    private static final String PROPERTY_IMAP_CONFIG_CHILDNAME = "spaces.imapConfig.childname";
+    private static final String PROPERTY_IMAP_TEMPLATES_CHILDNAME = "spaces.imap_templates.childname";
+
+    private ImporterBootstrap importerBootstrap;
+    protected Properties configuration;
+    private NodeRef imapTemplatesFolderNodeRef;
+
+    public void setImporterBootstrap(ImporterBootstrap importerBootstrap)
+    {
+        this.importerBootstrap = importerBootstrap;
+    }
+
+    protected void setUp() throws Exception
+    {
+        // get the node store that we must work against
+        StoreRef storeRef = importerBootstrap.getStoreRef();
+        if (storeRef == null)
+        {
+            throw new PatchException("Bootstrap store has not been set");
+        }
+        NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
+
+        this.configuration = importerBootstrap.getConfiguration();
+        // get the association names that form the path
+        String companyHomeChildName = configuration.getProperty(PROPERTY_COMPANY_HOME_CHILDNAME);
+        if (companyHomeChildName == null || companyHomeChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_COMPANY_HOME_CHILDNAME + "' is not present");
+        }
+        String dictionaryChildName = configuration.getProperty(PROPERTY_DICTIONARY_CHILDNAME);
+        if (dictionaryChildName == null || dictionaryChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_DICTIONARY_CHILDNAME + "' is not present");
+        }
+        String scriptsChildName = configuration.getProperty(PROPERTY_SCRIPTS_CHILDNAME);
+        if (scriptsChildName == null || scriptsChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_SCRIPTS_CHILDNAME + "' is not present");
+        }
+
+        String imapConfigChildName = configuration.getProperty(PROPERTY_IMAP_CONFIG_CHILDNAME);
+        if (imapConfigChildName == null || imapConfigChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_IMAP_CONFIG_CHILDNAME + "' is not present");
+        }
+
+        String imapTemplatesChildName = configuration.getProperty(PROPERTY_IMAP_TEMPLATES_CHILDNAME);
+        if (imapConfigChildName == null || imapConfigChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_IMAP_CONFIG_CHILDNAME + "' is not present");
+        }
+
+        // build the search string to get the company home node
+        StringBuilder sb = new StringBuilder(256);
+        sb.append("/").append(companyHomeChildName);
+        sb.append("/").append(dictionaryChildName);
+        sb.append("/").append(imapConfigChildName);
+        sb.append("/").append(imapTemplatesChildName);
+
+        String xpath = sb.toString();
+        List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, xpath, null, namespaceService, false);
+        if (nodeRefs.size() > 1)
+        {
+            throw new PatchException("XPath returned too many results: \n" + "   root: " + storeRootNodeRef + "\n" + "   xpath: " + xpath + "\n" + "   results: " + nodeRefs);
+        }
+        else if (nodeRefs.size() == 0)
+        {
+            this.imapTemplatesFolderNodeRef = null;
+        }
+        else
+        {
+            this.imapTemplatesFolderNodeRef = nodeRefs.get(0);
+        }
+
+    }
+
+    @Override
+    protected String applyInternal() throws Exception
+    {
+        setUp();
+        if (imapTemplatesFolderNodeRef != null)
+        {
+            NodeRef oldTextPlain = nodeService.getChildByName(imapTemplatesFolderNodeRef, ContentModel.ASSOC_CONTAINS, "emailbody-textplain.ftl");
+            NodeRef oldTextHTML = nodeService.getChildByName(imapTemplatesFolderNodeRef, ContentModel.ASSOC_CONTAINS, "emailbody-texthtml.ftl");
+
+            if (oldTextPlain != null)
+            {
+                nodeService.deleteNode(oldTextPlain);
+            }
+            if (oldTextHTML != null)
+            {
+                nodeService.deleteNode(oldTextHTML);
+            }
+        }
+
+        return I18NUtil.getMessage(MSG_REMOVED);
+    }
+
+}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapTemplatesPatch2.java b/source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapTemplatesPatch2.java
new file mode 100644
index 0000000000..f7064d45bb
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapTemplatesPatch2.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.importer.ImporterBootstrap;
+import org.alfresco.service.cmr.admin.PatchException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+public class ClearOldImapTemplatesPatch2 extends AbstractPatch
+{
+    private static final String MSG_REMOVED = "patch.imap.clear.old.messages.description.cleared";
+    
+    private static final String PROPERTY_COMPANY_HOME_CHILDNAME = "spaces.company_home.childname";
+    private static final String PROPERTY_DICTIONARY_CHILDNAME = "spaces.dictionary.childname";
+    private static final String PROPERTY_SCRIPTS_CHILDNAME = "spaces.scripts.childname";
+    private static final String PROPERTY_IMAP_CONFIG_CHILDNAME = "spaces.imapConfig.childname";
+    private static final String PROPERTY_IMAP_TEMPLATES_CHILDNAME = "spaces.imap_templates.childname";
+
+    private ImporterBootstrap importerBootstrap;
+    protected Properties configuration;
+    private NodeRef imapTemplatesFolderNodeRef;
+
+    public void setImporterBootstrap(ImporterBootstrap importerBootstrap)
+    {
+        this.importerBootstrap = importerBootstrap;
+    }
+
+    protected void setUp() throws Exception
+    {
+        // get the node store that we must work against
+        StoreRef storeRef = importerBootstrap.getStoreRef();
+        if (storeRef == null)
+        {
+            throw new PatchException("Bootstrap store has not been set");
+        }
+        NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
+
+        this.configuration = importerBootstrap.getConfiguration();
+        // get the association names that form the path
+        String companyHomeChildName = configuration.getProperty(PROPERTY_COMPANY_HOME_CHILDNAME);
+        if (companyHomeChildName == null || companyHomeChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_COMPANY_HOME_CHILDNAME + "' is not present");
+        }
+        String dictionaryChildName = configuration.getProperty(PROPERTY_DICTIONARY_CHILDNAME);
+        if (dictionaryChildName == null || dictionaryChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_DICTIONARY_CHILDNAME + "' is not present");
+        }
+        String scriptsChildName = configuration.getProperty(PROPERTY_SCRIPTS_CHILDNAME);
+        if (scriptsChildName == null || scriptsChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_SCRIPTS_CHILDNAME + "' is not present");
+        }
+
+        String imapConfigChildName = configuration.getProperty(PROPERTY_IMAP_CONFIG_CHILDNAME);
+        if (imapConfigChildName == null || imapConfigChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_IMAP_CONFIG_CHILDNAME + "' is not present");
+        }
+
+        String imapTemplatesChildName = configuration.getProperty(PROPERTY_IMAP_TEMPLATES_CHILDNAME);
+        if (imapConfigChildName == null || imapConfigChildName.length() == 0)
+        {
+            throw new PatchException("Bootstrap property '" + PROPERTY_IMAP_CONFIG_CHILDNAME + "' is not present");
+        }
+
+        // build the search string to get the company home node
+        StringBuilder sb = new StringBuilder(256);
+        sb.append("/").append(companyHomeChildName);
+        sb.append("/").append(dictionaryChildName);
+        sb.append("/").append(imapConfigChildName);
+        sb.append("/").append(imapTemplatesChildName);
+
+        String xpath = sb.toString();
+        List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, xpath, null, namespaceService, false);
+        if (nodeRefs.size() > 1)
+        {
+            throw new PatchException("XPath returned too many results: \n" + "   root: " + storeRootNodeRef + "\n" + "   xpath: " + xpath + "\n" + "   results: " + nodeRefs);
+        }
+        else if (nodeRefs.size() == 0)
+        {
+            this.imapTemplatesFolderNodeRef = null;
+        }
+        else
+        {
+            this.imapTemplatesFolderNodeRef = nodeRefs.get(0);
+        }
+
+    }
+
+    @Override
+    protected String applyInternal() throws Exception
+    {
+        setUp();
+        if (imapTemplatesFolderNodeRef != null)
+        {
+            List<String> templatesToDelete = new ArrayList<String>();
+            
+            templatesToDelete.add("emailbody-textplain.ftl");
+            templatesToDelete.add("emailbody-textplain_de.ftl");
+            templatesToDelete.add("emailbody-textplain_it.ftl");
+            templatesToDelete.add("emailbody-textplain_fr.ftl");
+            templatesToDelete.add("emailbody-textplain_ja.ftl");
+            templatesToDelete.add("emailbody-textplain_es.ftl");
+            
+            templatesToDelete.add("emailbody-texthtml.ftl");
+            templatesToDelete.add("emailbody-texthtml_de.ftl");
+            templatesToDelete.add("emailbody-texthtml_it.ftl");
+            templatesToDelete.add("emailbody-texthtml_fr.ftl");
+            templatesToDelete.add("emailbody-texthtml_ja.ftl");
+            templatesToDelete.add("emailbody-texthtml_es.ftl");
+            
+            for(String template : templatesToDelete)
+            {
+                NodeRef nodeRef = nodeService.getChildByName(imapTemplatesFolderNodeRef, ContentModel.ASSOC_CONTAINS, template);
+                if(nodeRef != null)
+                {
+                    nodeService.deleteNode(nodeRef);
+                }
+                
+            }
+       }
+
+        return I18NUtil.getMessage(MSG_REMOVED);
+    }
+
+}
diff --git a/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java b/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java
index 318e77f9b0..ac36a190ed 100644
--- a/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java
+++ b/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java
@@ -37,14 +37,16 @@ import javax.mail.internet.MimeMessage;
 
 import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.imap.ImapService.EmailBodyType;
+import org.alfresco.repo.imap.ImapService.EmailBodyFormat;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.QName;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -68,6 +70,7 @@ public abstract class AbstractMimeMessage extends MimeMessage
     protected ImapService imapService;
     protected FileInfo messageFileInfo;
     protected MimeMessage wrappedMessage;
+    protected boolean isMessageInSitesLibrary;
 
     protected AbstractMimeMessage(Session session)
     {
@@ -88,6 +91,7 @@ public abstract class AbstractMimeMessage extends MimeMessage
         this.serviceRegistry = serviceRegistry;
         this.imapService = serviceRegistry.getImapService();
         this.messageFileInfo = fileInfo;
+        this.isMessageInSitesLibrary = imapService.isNodeInSitesLibrary(messageFileInfo.getNodeRef());
         RetryingTransactionHelper txHelper = serviceRegistry.getTransactionService().getRetryingTransactionHelper();
         txHelper.setMaxRetries(MAX_RETRIES);
         txHelper.setReadOnly(false);
@@ -214,10 +218,10 @@ public abstract class AbstractMimeMessage extends MimeMessage
      * Returns the text representing email body for ContentModel node.
      * 
      * @param nodeRef NodeRef of the target content.
-     * @param type The type of the returned body. May be the one of {@link EmailBodyType}.
+     * @param type The type of the returned body. May be the one of {@link EmailBodyFormat}.
      * @return Text representing email body for ContentModel node.
      */
-    public String getEmailBodyText(EmailBodyType type)
+    public String getEmailBodyText(EmailBodyFormat type)
     {
         return serviceRegistry.getTemplateService().processTemplate(
                 imapService.getDefaultEmailBodyTemplate(type),
@@ -278,9 +282,46 @@ public abstract class AbstractMimeMessage extends MimeMessage
         model.put("date", new Date());
         model.put("contextUrl", new String(imapService.getWebApplicationContextUrl()));
         model.put("alfTicket", new String(serviceRegistry.getAuthenticationService().getCurrentTicket()));
+        if (isMessageInSitesLibrary)
+        {
+            String pathFromSites = getPathFromSites(parent);
+            StringBuilder parsedPath = new StringBuilder();
+            String[] pathParts = pathFromSites.split("/");
+            if (pathParts.length > 2)
+            {
+                parsedPath.append(pathParts[0]).append("/").append(pathParts[1]);
+                parsedPath.append("?filter=path|");
+                for (int i = 2; i < pathParts.length; i++)
+                {
+                    parsedPath.append("/").append(pathParts[i]);
+                }
+
+            }
+            else
+            {
+                parsedPath.append(pathFromSites);
+            }
+            model.put("shareContextUrl", new String(imapService.getShareApplicationContextUrl()));
+            model.put("parentPathFromSites", parsedPath.toString());
+        }
         return model;
     }
 
+    private String getPathFromSites(NodeRef ref)
+    {
+        NodeService nodeService = serviceRegistry.getNodeService();
+        String name = ((String) nodeService.getProperty(ref, ContentModel.PROP_NAME)).toLowerCase();
+        if (nodeService.getType(ref).equals(SiteModel.TYPE_SITE))
+        {
+            return name;
+        }
+        else
+        {
+            NodeRef parent = nodeService.getPrimaryParent(ref).getParentRef();
+            return getPathFromSites(parent) + "/" + name;
+        }
+    }
+
     protected void updateMessageID() throws MessagingException
     {
         setHeader("Message-ID", this.messageFileInfo.getNodeRef().getId());
diff --git a/source/java/org/alfresco/repo/imap/AlfrescoImapConst.java b/source/java/org/alfresco/repo/imap/AlfrescoImapConst.java
index a41d223d54..0afe148ed0 100644
--- a/source/java/org/alfresco/repo/imap/AlfrescoImapConst.java
+++ b/source/java/org/alfresco/repo/imap/AlfrescoImapConst.java
@@ -58,8 +58,12 @@ public interface AlfrescoImapConst
     public static final String USER_SEPARATOR = ";";
 
     // Default content model email message templates
-    public static final String CLASSPATH_TEXT_PLAIN_TEMPLATE = "/alfresco/templates/imap/imap_message_text_plain.ftl";
-    public static final String CLASSPATH_TEXT_HTML_TEMPLATE = "/alfresco/templates/imap/imap_message_text_html.ftl";
+    public static final String CLASSPATH_ALFRESCO_TEXT_PLAIN_TEMPLATE = "/alfresco/templates/imap/emailbody_textplain_alfresco.ftl";
+    public static final String CLASSPATH_SHARE_TEXT_PLAIN_TEMPLATE = "/alfresco/templates/imap/emailbody_textplain_share.ftl";
+    
+    public static final String CLASSPATH_ALFRESCO_TEXT_HTML_TEMPLATE = "/alfresco/templates/imap/emailbody_texthtml_alfresco.ftl";
+    public static final String CLASSPATH_SHARE_TEXT_HTML_TEMPLATE = "/alfresco/templates/imap/emailbody_texthtml_share.ftl";
+
 
     public static final String DICTIONARY_TEMPLATE_PREFIX = "emailbody";
     public static final String PREF_IMAP_FAVOURITE_SITES = "org.alfresco.share.sites.imapFavourites";
diff --git a/source/java/org/alfresco/repo/imap/ContentModelMessage.java b/source/java/org/alfresco/repo/imap/ContentModelMessage.java
index ff49be33a4..33a911eb4d 100644
--- a/source/java/org/alfresco/repo/imap/ContentModelMessage.java
+++ b/source/java/org/alfresco/repo/imap/ContentModelMessage.java
@@ -32,7 +32,7 @@ import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.MimeUtility;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.imap.ImapService.EmailBodyType;
+import org.alfresco.repo.imap.ImapService.EmailBodyFormat;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.namespace.QName;
@@ -98,10 +98,20 @@ public class ContentModelMessage extends AbstractMimeMessage
         // Cite MOB-395: "email agent will be used to select an appropriate template" - we are not able to
         // detect an email agent so we use a default template for all messages.
         // See AlfrescoImapConst to see the possible templates to use.
-        String bodyTxt = getEmailBodyText(EmailBodyType.TEXT_PLAIN);
-        rootMultipart.addBodyPart(getTextBodyPart(bodyTxt, EmailBodyType.TEXT_PLAIN.getSubtype(), EmailBodyType.TEXT_PLAIN.getMimeType()));
-        String bodyHtml = getEmailBodyText(EmailBodyType.TEXT_HTML);
-        rootMultipart.addBodyPart(getTextBodyPart(bodyHtml, EmailBodyType.TEXT_HTML.getSubtype(), EmailBodyType.TEXT_HTML.getMimeType()));
+        if (isMessageInSitesLibrary)
+        {
+            String bodyTxt = getEmailBodyText(EmailBodyFormat.SHARE_TEXT_PLAIN);
+            rootMultipart.addBodyPart(getTextBodyPart(bodyTxt, EmailBodyFormat.SHARE_TEXT_PLAIN.getSubtype(), EmailBodyFormat.SHARE_TEXT_PLAIN.getMimeType()));
+            String bodyHtml = getEmailBodyText(EmailBodyFormat.SHARE_TEXT_HTML);
+            rootMultipart.addBodyPart(getTextBodyPart(bodyHtml, EmailBodyFormat.SHARE_TEXT_HTML.getSubtype(), EmailBodyFormat.SHARE_TEXT_HTML.getMimeType()));
+        }
+        else
+        {
+            String bodyTxt = getEmailBodyText(EmailBodyFormat.ALFRESCO_TEXT_PLAIN);
+            rootMultipart.addBodyPart(getTextBodyPart(bodyTxt, EmailBodyFormat.ALFRESCO_TEXT_PLAIN.getSubtype(), EmailBodyFormat.ALFRESCO_TEXT_PLAIN.getMimeType()));
+            String bodyHtml = getEmailBodyText(EmailBodyFormat.ALFRESCO_TEXT_HTML);
+            rootMultipart.addBodyPart(getTextBodyPart(bodyHtml, EmailBodyFormat.ALFRESCO_TEXT_HTML.getSubtype(), EmailBodyFormat.ALFRESCO_TEXT_HTML.getMimeType()));
+        }
         return rootMultipart;
     }
 
diff --git a/source/java/org/alfresco/repo/imap/ImapService.java b/source/java/org/alfresco/repo/imap/ImapService.java
index da0b8b72eb..dbc9b3f8f7 100644
--- a/source/java/org/alfresco/repo/imap/ImapService.java
+++ b/source/java/org/alfresco/repo/imap/ImapService.java
@@ -35,37 +35,45 @@ public interface ImapService
 {
     
     /**
-     * Helper enumeration to handle email body type text/html and text/plain
+     * Helper enumeration to handle email body format text/html and text/plain for Alfresco/Share webapp
      */
-    public static enum EmailBodyType
+    public static enum EmailBodyFormat
     {
-        TEXT_PLAIN(AlfrescoImapConst.CLASSPATH_TEXT_PLAIN_TEMPLATE),
-        TEXT_HTML(AlfrescoImapConst.CLASSPATH_TEXT_HTML_TEMPLATE);
+        ALFRESCO_TEXT_PLAIN(AlfrescoImapConst.CLASSPATH_ALFRESCO_TEXT_PLAIN_TEMPLATE),
+        SHARE_TEXT_PLAIN(AlfrescoImapConst.CLASSPATH_SHARE_TEXT_PLAIN_TEMPLATE),
         
-        EmailBodyType(String templatePath)
+        ALFRESCO_TEXT_HTML(AlfrescoImapConst.CLASSPATH_ALFRESCO_TEXT_HTML_TEMPLATE),
+        SHARE_TEXT_HTML(AlfrescoImapConst.CLASSPATH_SHARE_TEXT_HTML_TEMPLATE);
+        
+        EmailBodyFormat(String templatePath)
         {
             this.templatePath = templatePath;
         }
         public String getSubtype()
         {
-            return name().toLowerCase().substring(5);
+            return name().toLowerCase().substring(name().indexOf("_") + 1 + "TEXT".length());
         }
 
         public String getTypeSubtype()
         {
-            return name().toLowerCase().replaceAll("_", "");
+            return name().toLowerCase().substring(name().indexOf("_") + 1).replaceAll("_", "");
         }
 
         public String getMimeType()
         {
-            return name().toLowerCase().replaceAll("_", "/");
+            return name().toLowerCase().substring(name().indexOf("_") + 1).replaceAll("_", "/");
         }
         
-        public String getClasspathTempltePath()
+        public String getClasspathTemplatePath()
         {
             return this.templatePath;
         }
         
+        public String getWebApp()
+        {
+            return name().toLowerCase().substring(0, name().indexOf("_"));
+        }
+        
         private String templatePath;
 
     }
@@ -228,6 +236,11 @@ public interface ImapService
      */
     public String getWebApplicationContextUrl();
 
+    /**
+     * @return Web application context url for share (e.g. http://localhost:8080/share)
+     */
+    public String getShareApplicationContextUrl();
+
     /**
      * Returns a template for email body. It is either classpath path or NodeRef.toString().
      * This method trying to find a template on the path in the repository first
@@ -238,5 +251,14 @@ public interface ImapService
      * @param Type one of the possible body types text/html and text/plain
      * @return
      */
-    public String getDefaultEmailBodyTemplate(EmailBodyType type);
+    public String getDefaultEmailBodyTemplate(EmailBodyFormat type);
+    
+    /**
+     * Determine if provided node belongs to Sites.
+     * 
+     * @param nodeRef nodeRef
+     * @return true if provided node belongs to sites.
+     */
+    public boolean isNodeInSitesLibrary(NodeRef nodeRef);
+
 }
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
index 0084fd942b..a64d3dacc0 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
@@ -127,7 +127,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
     private String repositoryTemplatePath;
     private boolean extractAttachmentsEnabled = true;
 
-    private Map<EmailBodyType, String> defaultBodyTemplates;
+    private Map<EmailBodyFormat, String> defaultBodyTemplates;
 
     private final static Map<QName, Flags.Flag> qNameToFlag;
     private final static Map<Flags.Flag, QName> flagToQname;
@@ -271,6 +271,11 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
         return sysAdminParams.getAlfrescoProtocol() + "://" + sysAdminParams.getAlfrescoHost() + ":" + sysAdminParams.getAlfrescoPort() + "/" + sysAdminParams.getAlfrescoContext();
     }
 
+    public String getShareApplicationContextUrl()
+    {
+        return sysAdminParams.getShareProtocol() + "://" + sysAdminParams.getShareHost() + ":" + sysAdminParams.getSharePort() + "/" + sysAdminParams.getShareContext();
+    }
+
     public String getRepositoryTemplatePath()
     {
         return repositoryTemplatePath;
@@ -1915,21 +1920,23 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
         return extractAttachmentsEnabled && !ignoreExtractionFolders.contains(nodeRef);
     }
 
-    public String getDefaultEmailBodyTemplate(EmailBodyType type)
+    public String getDefaultEmailBodyTemplate(EmailBodyFormat type)
     {
         if (defaultBodyTemplates == null)
         {
-            defaultBodyTemplates = new HashMap<EmailBodyType, String>(2);
+            defaultBodyTemplates = new HashMap<EmailBodyFormat, String>(4);
             
-            for (EmailBodyType onetype : EmailBodyType.values())
+            for (EmailBodyFormat onetype : EmailBodyFormat.values())
             {
-                String result = onetype.getClasspathTempltePath();
+                String result = onetype.getClasspathTemplatePath();
                 try
                 {
                     // This query uses cm:name to find the template node(s).
                     // For the case where the templates are renamed, it would be better to use a QName path-based query.
                     
-                    final StringBuilder templateName = new StringBuilder(DICTIONARY_TEMPLATE_PREFIX).append("-").append(onetype.getTypeSubtype()).append(".ftl");
+
+                    final StringBuilder templateName = new StringBuilder(DICTIONARY_TEMPLATE_PREFIX).append("_").append(onetype.getTypeSubtype()).append("_").append(onetype.getWebApp()).append(".ftl");
+
                     final String repositoryTemplatePath = getRepositoryTemplatePath();
                     int indexOfStoreDelim = repositoryTemplatePath.indexOf(StoreRef.URI_FILLER);
                     if (indexOfStoreDelim == -1)
@@ -1953,7 +1960,11 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
                     ResultSet resultSet = serviceRegistry.getSearchService().query(storeRef, "xpath", query);
                     if (resultSet == null || resultSet.length() == 0)
                     {
-                        throw new IllegalArgumentException(String.format("[getDefaultEmailBodyTemplate] IMAP message template '%1$s' does not exist in the path '%2$s'.", templateName, repositoryTemplatePath));
+                        if(logger.isDebugEnabled())
+                        {
+                            logger.debug("template not found:" + templateName);
+                        }
+                        throw new AlfrescoRuntimeException(String.format("[getDefaultEmailBodyTemplate] IMAP message template '%1$s' does not exist in the path '%2$s'.", templateName, repositoryTemplatePath));
                     }
                     final NodeRef defaultLocaleTemplate = resultSet.getNodeRef(0);
                     
@@ -1963,7 +1974,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
                     
                     resultSet.close();
                 }
-                // We are catching all exceptions. E.g. search service can possibly trow an exceptions on malformed queries.
+                // We are catching all exceptions. E.g. search service can possibly throw an exceptions on malformed queries.
                 catch (Exception e)
                 {
                     logger.error("[getDefaultEmailBodyTemplate]", e);
@@ -2153,5 +2164,33 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
         
     }
     
-   
+    /**
+     * Return true if provided nodeRef is in Sites/.../documentlibrary
+     */
+    public boolean isNodeInSitesLibrary(NodeRef nodeRef)
+    {
+        boolean isInDocLibrary = false;
+        NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef();
+        while (parent != null && !nodeService.getType(parent).equals(SiteModel.TYPE_SITE))
+        {
+            String parentName = (String) nodeService.getProperty(parent, ContentModel.PROP_NAME);
+            if (parentName.equalsIgnoreCase("documentlibrary"))
+            {
+                isInDocLibrary = true;
+            }
+            nodeRef = parent;
+            if (nodeService.getPrimaryParent(nodeRef) != null)
+            {
+                parent = nodeService.getPrimaryParent(nodeRef).getParentRef();
+            }
+        }
+        if (parent == null)
+        {
+            return false;
+        }
+        else
+        {
+            return nodeService.getType(parent).equals(SiteModel.TYPE_SITE) && isInDocLibrary;
+        }
+   }
 }