diff --git a/app/models/article.rb b/app/models/article.rb
index 9e2495e..9679923 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -20,6 +20,8 @@ class Article < ActiveRecord::Base
 
   settings_items :display_hits, :type => :boolean, :default => true
 
+  belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
+
   before_create do |article|
     article.published_at = article.created_at if article.published_at.nil?
   end
diff --git a/app/models/folder.rb b/app/models/folder.rb
index 9fbe2b4..52da75e 100644
--- a/app/models/folder.rb
+++ b/app/models/folder.rb
@@ -71,7 +71,8 @@ class Folder < Article
 
   has_many :images, :class_name => 'Article',
                     :foreign_key => 'parent_id',
-                    :order => 'type, name',
-                    :conditions => ['type = ? and content_type in (?) or type = ?', 'UploadedFile', UploadedFile.content_types, 'Folder']
+                    :order => 'articles.type, articles.name',
+                    :include => :reference_article,
+                    :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type = 'Folder' or (articles.type = 'PublishedArticle' and reference_articles_articles.type = 'UploadedFile' and reference_articles_articles.content_type in (?))", UploadedFile.content_types, UploadedFile.content_types]
 
 end
diff --git a/app/models/published_article.rb b/app/models/published_article.rb
index c993b6e..d58ec32 100644
--- a/app/models/published_article.rb
+++ b/app/models/published_article.rb
@@ -1,6 +1,4 @@
 class PublishedArticle < Article
-  belongs_to :reference_article, :class_name => "Article"
-
   before_create do |article|
     parent = article.reference_article.parent
     if parent && parent.blog? && article.profile.has_blog?
diff --git a/app/views/content_viewer/_published_article.rhtml b/app/views/content_viewer/_published_article.rhtml
new file mode 100644
index 0000000..ebd0660
--- /dev/null
+++ b/app/views/content_viewer/_published_article.rhtml
@@ -0,0 +1,7 @@
+<% article = published_article.reference_article %>
+<% if article.image? %>
+  <div> <%= link_to image_tag(article.public_filename(:thumb)), article.view_url %> </div>
+<% else %>
+  <%= render :partial => 'article', :object => article %>
+<% end %>
+
diff --git a/app/views/content_viewer/slideshow.rhtml b/app/views/content_viewer/slideshow.rhtml
index 079fbf9..e843bfb 100644
--- a/app/views/content_viewer/slideshow.rhtml
+++ b/app/views/content_viewer/slideshow.rhtml
@@ -1,6 +1,7 @@
 <p class='back-button' ><%= button('', _('Back to gallery'), @page.url)%></p>
 <ul id='slideshow' >
   <% @images.each do |img| -%>
+    <% img = img.reference_article if img.kind_of?(PublishedArticle) -%>
     <% if img.image? -%>
       <li><%= image_tag(url_for(img.public_filename(:display)), :title => (img.abstract.blank? ? img.name : img.abstract)) %></li>
     <% end -%>
diff --git a/test/unit/folder_test.rb b/test/unit/folder_test.rb
index 053e438..5b0a6b0 100644
--- a/test/unit/folder_test.rb
+++ b/test/unit/folder_test.rb
@@ -136,4 +136,14 @@ class FolderTest < ActiveSupport::TestCase
 
     assert_equal [highlighted_t].map(&:slug), folder.news(2, true).map(&:slug)
   end
+
+  should 'return published images as images' do
+    p = create_user('test_user').person
+    i = UploadedFile.create!(:profile => p, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    c = Community.create!(:name => 'test_com')
+    folder = Folder.create!(:name => 'folder', :profile => c)
+    pi = PublishedArticle.create!(:profile => c, :reference_article => i, :parent => folder)
+
+    assert_includes folder.images, pi
+  end
 end
--
libgit2 0.21.2