diff --git a/config/alfresco/bootstrap/imapSpacesLocales.acp b/config/alfresco/bootstrap/imapSpacesLocales.acp
deleted file mode 100644
index f73532a2a0..0000000000
Binary files a/config/alfresco/bootstrap/imapSpacesLocales.acp and /dev/null differ
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index fa2d4d9ccf..54dc3db59c 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -408,6 +408,8 @@ patch.htmlNotificationMailTemplates.description=Adds HTML email templates for no
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
 
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
+
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
 patch.fixAclInheritance.description=Fixes any ACL inheritance issues.
diff --git a/config/alfresco/messages/patch-service_de.properties b/config/alfresco/messages/patch-service_de.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_de.properties
+++ b/config/alfresco/messages/patch-service_de.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_es.properties b/config/alfresco/messages/patch-service_es.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_es.properties
+++ b/config/alfresco/messages/patch-service_es.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_fr.properties
+++ b/config/alfresco/messages/patch-service_fr.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_it.properties
+++ b/config/alfresco/messages/patch-service_it.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_ja.properties b/config/alfresco/messages/patch-service_ja.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_ja.properties
+++ b/config/alfresco/messages/patch-service_ja.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_nl.properties b/config/alfresco/messages/patch-service_nl.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_nl.properties
+++ b/config/alfresco/messages/patch-service_nl.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 1dfb452453..8ac210cbb7 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2717,22 +2717,13 @@
         </property>
     </bean>
     
-    <bean id="patch.imapSpacesLocaleTemplates" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+    <!-- Used to bootstrap imapSpacesLocales Prior to share/alfresco split of 3.5  -->
+    <bean id="patch.imapSpacesLocaleTemplates" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch">
         <property name="id"><value>patch.imapSpacesLocaleTemplates</value></property>
-        <property name="description"><value>patch.imapSpacesLocaleTemplates.description</value></property>
+        <property name="description"><value>patch.noOpPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>5005</value></property>
-        <property name="targetSchema"><value>5006</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/imapSpacesLocales.acp</prop>
-                <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
-            </props>
-        </property>
+        <property name="fixesToSchema"><value>4302</value></property>
+        <property name="targetSchema"><value>4305</value></property>
     </bean>
     
     <!-- For importing whole sites -->
@@ -2859,8 +2850,8 @@
     </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="id"><value>patch.imapSpacesTemplates2</value></property>
+        <property name="description"><value>patch.imapSpacesLocaleTemplates2.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>5005</value></property>
         <property name="targetSchema"><value>5006</value></property>