diff --git a/apps/documents/conf/settings.py b/apps/documents/conf/settings.py
index 6799404870..ec3a1d5411 100755
--- a/apps/documents/conf/settings.py
+++ b/apps/documents/conf/settings.py
@@ -58,3 +58,4 @@ DEFAULT_TRANSFORMATIONS = getattr(settings, 'DOCUMENTS_DEFAULT_TRANSFORMATIONS',
 #Groups
 GROUP_MAX_RESULTS = getattr(settings, 'DOCUMENTS_GROUP_MAX_RESULTS', 20)
 GROUP_SHOW_EMPTY = getattr(settings, 'DOCUMENTS_GROUP_SHOW_EMPTY', True)
+GROUP_SHOW_THUMBNAIL = getattr(settings, 'DOCUMENTS_GROUP_SHOW_THUMBNAIL', True)
diff --git a/apps/documents/views.py b/apps/documents/views.py
index 3089599807..d1a96335b5 100755
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -32,6 +32,7 @@ from documents.conf.settings import PREVIEW_SIZE
 from documents.conf.settings import THUMBNAIL_SIZE
 from documents.conf.settings import GROUP_MAX_RESULTS
 from documents.conf.settings import GROUP_SHOW_EMPTY
+from documents.conf.settings import GROUP_SHOW_THUMBNAIL
 from documents.conf.settings import DEFAULT_TRANSFORMATIONS
 from documents.conf.settings import AUTOMATIC_OCR
 from documents.conf.settings import UNCOMPRESS_COMPRESSED_LOCAL_FILES
@@ -315,15 +316,22 @@ def document_view(request, document_id):
                     total_string = '(%s)' % len(data)
             else:
                 total_string = ''
+              
+            extra_columns = [{'name':'current','attribute':lambda x:
+                    '<span class="famfam active famfam-resultset_previous"></span>' if x == document else ''}]
+                    
+            if GROUP_SHOW_THUMBNAIL:
+                extra_columns.append({'name':_(u'thumbnail'), 'attribute': 
+                        lambda x: '<a class="fancybox" href="%s"><img src="%s" /></a>' % (reverse('document_preview', args=[x.id]),
+                        reverse('document_thumbnail', args=[x.id]))})
+                
             sidebar_groups.append({
                 'title':'%s %s' % (group.label, total_string),
                 'name':'generic_list_subtemplate.html',
                 'object_list':data[:GROUP_MAX_RESULTS],
                 'hide_columns':True,
                 'hide_header':True,
-                'extra_columns':[
-                    {'name':'current','attribute':lambda x: '<span class="famfam active famfam-resultset_previous"></span>' if x == document else ''}
-                ],
+                'extra_columns':extra_columns,
                 })
             
     return render_to_response('generic_detail.html', {
diff --git a/apps/main/views.py b/apps/main/views.py
index 62c9fc14dd..2dc0b2c17b 100755
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -36,6 +36,11 @@ def check_settings(request):
         {'name':'DOCUMENTS_UNCOMPRESS_COMPRESSED_LOCAL_FILES', 'value':documents_settings.UNCOMPRESS_COMPRESSED_LOCAL_FILES},
         {'name':'DOCUMENTS_UNCOMPRESS_COMPRESSED_STAGING_FILES', 'value':documents_settings.UNCOMPRESS_COMPRESSED_STAGING_FILES},
 
+        #Groups
+        {'name':'DOCUMENTS_GROUP_MAX_RESULTS', 'value':documents_settings.GROUP_MAX_RESULTS},
+        {'name':'DOCUMENTS_GROUP_SHOW_EMPTY', 'value':documents_settings.GROUP_SHOW_EMPTY},
+        {'name':'DOCUMENTS_GROUP_SHOW_THUMBNAIL', 'value':documents_settings.GROUP_SHOW_THUMBNAIL},
+
         #Filesystem_serving
         {'name':'FILESYSTEM_FILESERVING_ENABLE', 'value':filesystem_serving_settings.FILESERVING_ENABLE},
         {'name':'FILESYSTEM_FILESERVING_PATH', 'value':filesystem_serving_settings.FILESERVING_PATH, 'exists':True},
diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index 86a5b6db73..9e23ccf878 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -53,3 +53,7 @@
 * Initial GridFS storage support
 * Implemented size and delete methods for GridFS
 * Implement GridFS storage user settings
+
+2011-Mar 05
+* If current user is superuser or staff show thumbnail & preview generation error messages
+* Added a setting to show document thumbnail in metadata group list
diff --git a/settings.py b/settings.py
index edb16b688b..84214e78d8 100755
--- a/settings.py
+++ b/settings.py
@@ -211,6 +211,7 @@ LOGIN_EXEMPT_URLS = (
 # Groups
 #DOCUMENTS_GROUP_MAX_RESULTS = 20
 #DOCUMENTS_GROUP_SHOW_EMPTY = True
+#DOCUMENTS_GROUP_SHOW_THUMBNAIL = True
 
 # Serving
 #FILESYSTEM_FILESERVING_ENABLE = True