diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 04e6e44ff..5792bc9a9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.3.8
+ - Added a attachment_thumbnail option to the CS RSS feed.
 
 7.3.7
  - Fixed a template variable rewriting problem with Template Toolkit.
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 520c3140b..26d82b50e 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1606,7 +1606,7 @@ sub newByUrl {
 	$url =~ s/\"//;
 	my $asset;
 	if ($url ne "") {
-		my ($id, $class) = $session->db->quickArray("select distinct asset.assetId, asset.className from assetData join asset using (assetId) where assetData.url = ?", [ $url ]);
+		my ($id, $class) = $session->db->quickArray("select asset.assetId, asset.className from assetData join asset using (assetId) where assetData.url = ? limit 1", [ $url ]);
 		if ($id ne "" || $class ne "") {
 			return WebGUI::Asset->new($session,$id, $class, $revisionDate);
 		} else {
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index b88aa4d9b..7be7ac5b2 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -689,6 +689,7 @@ SQL
                 push @{$attachmentLoop}, {
                     'attachment.url'        => $storage->getUrl($file),
                     'attachment.path'       => $storage->getPath($file),
+                    'attachment_thumbnail'  => $storage->getThumbnailUrl($file),
                     'attachment.length'     => $storage->getFileSize($file),
                 };
             }
diff --git a/lib/WebGUI/Help/Asset_Collaboration.pm b/lib/WebGUI/Help/Asset_Collaboration.pm
index 3d260ddf5..5e8855513 100644
--- a/lib/WebGUI/Help/Asset_Collaboration.pm
+++ b/lib/WebGUI/Help/Asset_Collaboration.pm
@@ -718,6 +718,9 @@ our $HELP = {
 		                             {
 		                               'name' => 'attachmentLoop',
 		                               'variables' => [
+		                                                {
+		                                                  'name' => 'attachment_thumbnail'
+		                                                },
 		                                                {
 		                                                  'name' => 'attachment.url'
 		                                                },