diff --git a/apps/converter/api.py b/apps/converter/api.py
index 7d93c51bfb..cae89b9d43 100644
--- a/apps/converter/api.py
+++ b/apps/converter/api.py
@@ -134,7 +134,10 @@ def convert(input_filepath, size, quality=QUALITY_DEFAULT, cache=True, page=0, f
 
         if rotation != 0 and rotation != 360:
             extra_options += u' -rotate %d ' % rotation
-
+        
+        if format == u'jpg':
+            extra_options += u' -quality 85'
+    
         backend.execute_convert(input_filepath=input_arg, arguments=extra_options, output_filepath=u'%s:%s' % (format, output_filepath), quality=quality)
     finally:
         if cleanup_files:
diff --git a/apps/documents/views.py b/apps/documents/views.py
index 8e4b6a2827..88fc8f6d42 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -562,12 +562,12 @@ def get_document_image(request, document_id, size=PREVIEW_SIZE, quality=QUALITY_
     rotation = int(request.GET.get('rotation', 0)) % 360
 
     try:
-        filepath = in_image_cache(document.checksum, size=size, quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom, rotation=rotation)
+        filepath = in_image_cache(document.checksum, size=size, format=u'jpg', quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom, rotation=rotation)
         if filepath:
             return sendfile.sendfile(request, filename=filepath)
         #Save to a temporary location
         filepath = document_save_to_temp_dir(document, filename=document.checksum)
-        output_file = convert(filepath, size=size, format='jpg', quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom, rotation=rotation)
+        output_file = convert(filepath, size=size, format=u'jpg', quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom, rotation=rotation)
         return sendfile.sendfile(request, filename=output_file)
     except UnkownConvertError, e:
         if request.user.is_staff or request.user.is_superuser: