diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index b013c1338b..8db5cad327 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/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
diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml
index 3aff50eb6b..7f27bf66c9 100644
--- a/config/alfresco/web-client-config-properties.xml
+++ b/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 -->
    <!-- ********************************** -->
diff --git a/source/web/images/filetypes/eml.gif b/source/web/images/filetypes/eml.gif
deleted file mode 100755
index 31ddcd03a0..0000000000
Binary files a/source/web/images/filetypes/eml.gif and /dev/null differ
diff --git a/source/web/images/filetypes32/eml.gif b/source/web/images/filetypes32/eml.gif
deleted file mode 100755
index ac879afcdb..0000000000
Binary files a/source/web/images/filetypes32/eml.gif and /dev/null differ