diff --git a/apps/documents/views.py b/apps/documents/views.py
index 8156a6eaed..f119b7289a 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -557,7 +557,7 @@ def document_download(request, document_id):
     try:
         #Test permissions and trigger exception
         document.open()
-        return serve_file(request, document.file, save_as='%s' % document.get_fullname())
+        return serve_file(request, document.file, save_as='%s' % document.get_fullname(), content_type='image/jpeg')
     except Exception, e:
         messages.error(request, e)
         return HttpResponseRedirect(request.META['HTTP_REFERER'])
diff --git a/settings.py b/settings.py
index b634666df8..b95cb71537 100644
--- a/settings.py
+++ b/settings.py
@@ -89,6 +89,7 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
+    'common.middleware.strip_spaces_widdleware.SpacelessMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
@@ -97,7 +98,6 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'common.middleware.login_required_middleware.LoginRequiredMiddleware',
     'pagination.middleware.PaginationMiddleware',
-    #'common.middleware.strip_spaces_widdleware.SpacelessMiddleware',
     'permissions.middleware.permissiondeniedmiddleware.PermissionDeniedMiddleware',
 )