Reverse-merged /alfresco/BRANCHES/DEV/IMAP3:r14500,14521,14560,14563,14632

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -1727,10 +1727,6 @@ wf_adhoc_assignee=Assigned To
 # Email Server messages
 email.server.alias=Email Alias
 
-# Imap Server messages
-imap.attachments=Attachments
-imap.attachments.folder=Attachments Folder
-
 # Admin Console messages
 title_admin_console=Administration Console
 admin_console=Administration Console

config/alfresco/web-client-config-properties.xml

@@ -677,18 +677,6 @@
       </property-sheet>
    </config>
 
-   <!-- ******************************** -->
-   <!-- Configuration for Imap Server   -->
-   <!-- ******************************** -->
-   
-   <config evaluator="aspect-name" condition="imap:imapContent">
-      <property-sheet>
-         <show-association name="imap:attachment" display-label-id="imap.attachments" show-in-edit-mode="false"/>
-         <show-association name="imap:attachmentsFolder" display-label-id="imap.attachments.folder" show-in-edit-mode="false"/>
-      </property-sheet>
-   </config>
-   
-
    <!-- ********************************** -->
    <!-- Configuration for Email ID aspects -->
    <!-- ********************************** -->