diff --git a/browser/common.py b/browser/common.py
index cd0b2b8..020c5de 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -23,6 +23,7 @@ $Id$
 """
 
 from cgi import parse_qs, parse_qsl
+#import mimetypes
 import re
 from urllib import urlencode
 from zope import component
@@ -352,9 +353,10 @@ class BaseView(GenericView, I18NView):
         ct = getattr(self.context, 'contentType', None)
         if ct:
             ext = mimetypes.extensions.get(ct)
+            #ext = mimetypes.guess_extension(ct)
             if ext:
                 #return '%s (%s)' % (t, ext.upper())
-                return ext.upper()
+                return ext.upper()  #.lstrip('.')
         return self.typeTitle
 
     @Lazy
diff --git a/integrator/office/base.py b/integrator/office/base.py
index 79254d1..ef6b1ff 100644
--- a/integrator/office/base.py
+++ b/integrator/office/base.py
@@ -56,6 +56,8 @@ class OfficeFile(ExternalFileAdapter):
 
     propertyMap = {u'Revision:': 'version'}
     propFileName = 'docProps/custom.xml'
+    fileExtensions = ('.docm', '.docx', 'dotm', 'dotx',
+                      '.xlsm', '.xlsx', '.xltm', '.xltx')
 
     @Lazy
     def logger(self):
@@ -64,7 +66,7 @@ class OfficeFile(ExternalFileAdapter):
     def setExternalAddress(self, addr):
         super(OfficeFile, self).setExternalAddress(addr)
         root, ext = os.path.splitext(self.externalAddress)
-        if ext.lower() in ('.docx', '.xlsm'):
+        if ext.lower() in self.fileExtensions:
             self.processDocument()
     externalAddress = property(ExternalFileAdapter.getExternalAddress,
                                setExternalAddress)