diff --git a/docs/upgrades/upgrade_4.8.0-4.9.0.sql b/docs/upgrades/upgrade_4.8.0-4.9.0.sql
index 6cab69ec8..391632156 100644
--- a/docs/upgrades/upgrade_4.8.0-4.9.0.sql
+++ b/docs/upgrades/upgrade_4.8.0-4.9.0.sql
@@ -955,7 +955,7 @@ INSERT INTO template VALUES (1,'Default Link List','<tmpl_if displayTitle>\r\n
 INSERT INTO template VALUES (2,'Unordered List','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n  <a href=\"<tmpl_var addlink.url>\"><tmpl_var addlink.label></a><p />\r\n</tmpl_if>\r\n\r\n<ul>\r\n<tmpl_loop link_loop>\r\n<li>\r\n   <tmpl_if session.var.adminOn>\r\n         <tmpl_var link.controls>\r\n   </tmpl_if>\r\n   \r\n   <a href=\"<tmpl_var link.url\"\r\n   <tmpl_if link.newwindow>\r\n          target=\"_blank\"\r\n    </tmpl_if>\r\n    ><span class=\"linkTitle\"><tmpl_var link.name></span></a>\r\n\r\n    <tmpl_if link.description>\r\n              - <tmpl_var link.description>\r\n   </tmpl_if>\r\n </li>\r\n</tmpl_loop>\r\n</u>','LinkList');
 INSERT INTO template VALUES (3,'Ordered List','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n  <a href=\"<tmpl_var addlink.url>\"><tmpl_var addlink.label></a><p />\r\n</tmpl_if>\r\n\r\n<ol>\r\n<tmpl_loop link_loop>\r\n  <li>\r\n   <tmpl_if session.var.adminOn>\r\n         <tmpl_var link.controls>\r\n   </tmpl_if>\r\n\r\n   <a href=\"<tmpl_var link.url\"\r\n   <tmpl_if link.newwindow>\r\n          target=\"_blank\"\r\n    </tmpl_if>\r\n    ><span class=\"linkTitle\"><tmpl_var link.name></span></a>\r\n\r\n    <tmpl_if link.description>\r\n              - <tmpl_var link.description>\r\n   </tmpl_if>\r\n  </li>\r\n</tmpl_loop>\r\n</ol>','LinkList');
 INSERT INTO template VALUES (4,'Descriptive','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p/>\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n  <a href=\"<tmpl_var addlink.url>\"><tmpl_var addlink.label></a><p />\r\n</tmpl_if>\r\n\r\n<tmpl_loop link_loop>\r\n   <tmpl_if session.var.adminOn>\r\n         <tmpl_var link.controls> <br />\r\n   </tmpl_if>\r\n\r\n  <a href=\"<tmpl_var link.url\"\r\n   <tmpl_if link.newwindow>\r\n          target=\"_blank\"\r\n    </tmpl_if>\r\n    ><span class=\"linkTitle\"><tmpl_var link.name></span></a>\r\n\r\n    <tmpl_if link.description>\r\n              - <tmpl_var link.description>\r\n   </tmpl_if>\r\n   <p />\r\n</tmpl_loop>\r\n','LinkList');
-
+insert into settings (name, value) values ('snippetsPreviewLength'', 30);
 
 
 
diff --git a/lib/WebGUI/Operation/Collateral.pm b/lib/WebGUI/Operation/Collateral.pm
index 3d6a000db..4ac72abcf 100644
--- a/lib/WebGUI/Operation/Collateral.pm
+++ b/lib/WebGUI/Operation/Collateral.pm
@@ -32,6 +32,7 @@ use WebGUI::Session;
 use WebGUI::SQL;
 use Tie::IxHash;
 use WebGUI::URL;
+use WebGUI::HTML;
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(&www_editCollateral &www_editCollateralSave &www_deleteCollateral 
@@ -276,7 +277,6 @@ sub www_editCollateralSave {
         	$file = WebGUI::Attachment->new("","images",$session{form}{cid});
        		$file->save("filename", $thumbnailSize);
 	} else {
-		print "<h1> thumbnailsize: $thumbnailSize</h1>";
 		$file = WebGUI::Attachment->new($collateral->{filename},"images", $session{form}{cid});
 		WebGUI::Attachment::_createThumbnail($file, $thumbnailSize);
 	}
@@ -372,7 +372,7 @@ sub www_editCollateralFolderSave {
 #-------------------------------------------------------------------
 sub www_listCollateral {
 	return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(4));
-	my (%type, %user, $f, $row, $data, $sth, $url, $output, $parent, $p, $thumbnail, $file, $page, $constraints, $folderId);
+	my (%type, %user, $f, $row, $data, $sth, $url, $output, $parent, $p, $thumbnail, $file, $page, $constraints, $folderId, $crCount);
 	tie %type, 'Tie::IxHash';
 	tie %user, 'Tie::IxHash';
 	%type = (
@@ -396,7 +396,7 @@ sub www_listCollateral {
 	$constraints .= " and collateralType=".quote($session{scratch}{collateralType}) if ($session{scratch}{collateralType});
 	$constraints .= " and name like ".quote('%'.$session{scratch}{keyword}.'%') if ($session{scratch}{keyword});
 	$p = WebGUI::Paginator->new(WebGUI::URL::page('op=listCollateral'),[],"",$session{scratch}{collateralPageNumber});
-	$p->setDataByQuery("select collateralId, name, filename, collateralType, dateUploaded, username 
+	$p->setDataByQuery("select collateralId, name, filename, collateralType, dateUploaded, username, parameters 
 		from collateral where $constraints order by name");
 	$page = $p->getPageData;
 	$output = helpIcon(49);
@@ -456,6 +456,11 @@ sub www_listCollateral {
 		} elsif ($row->{filename} ne "" && $row->{collateralType} eq "file") {
 			$file = WebGUI::Attachment->new($row->{filename},"images",$row->{collateralId});
 			$thumbnail = '<a href="'.$url.'"><img src="'.$file->getIcon.'" border="0" /></a>';
+		} elsif ($row->{collateralType} eq "snippet") {
+			$crCount = $row->{parameters} =~ s/(\n[^\n]\r?|\r[^\r]\n?)/\&crarr;/gs;
+			$row->{parameters} = WebGUI::HTML::filter($row->{parameters},'all');
+			$thumbnail = substr($row->{parameters},0,$session{setting}{snippetsPreviewLength}+$crCount*6);
+			$thumbnail .= '...' if (length($row->{parameters}) > $session{setting}{snippetsPreviewLength});
 		} else {
 			$thumbnail = "";
 		}
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index dc2605748..5c1638e51 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -105,6 +105,7 @@ sub www_editContentSettings {
         $f->integer("maxAttachmentSize",WebGUI::International::get(130),$session{setting}{maxAttachmentSize});
         $f->integer("maxImageSize",WebGUI::International::get(583),$session{setting}{maxImageSize});
         $f->integer("thumbnailSize",WebGUI::International::get(406),$session{setting}{thumbnailSize});
+        $f->integer("snippetsPreviewLength",'Snippets preview length',$session{setting}{snippetsPreviewLength});
         $f->integer("textAreaRows",WebGUI::International::get(463),$session{setting}{textAreaRows});
         $f->integer("textAreaCols",WebGUI::International::get(464),$session{setting}{textAreaCols});
         $f->integer("textBoxSize",WebGUI::International::get(465),$session{setting}{textBoxSize});