diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 3fee903..d771379 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -70,23 +70,29 @@
 <%= display_source_info(@page) %>
 
 <div class="comments" id="comments_list">
-  <% if @page.accept_comments? %>
-  <h3 <%= 'class="no-comments-yet"' if @comments.size == 0 %>>
-    <%= number_of_comments(@page) %>
-  </h3>
-  <% if @comments_count > 1 %>
-  <p class="post-comment-button"><a href="#comment_form" onclick="jQuery('#page-comment-form h4').first().trigger('click')"><%= _('Post a comment') %></a></p>
+
+  <% if @page.accept_comments? || @comments_count > 0 %>
+    <h3 <%= 'class="no-comments-yet"' if @comments_count == 0 %>>
+      <%= number_of_comments(@page) %>
+    </h3>
+  <% end %>
+
+  <% if @page.accept_comments? && @comments_count > 1 %>
+    <p class="post-comment-button"><a href="#comment_form" onclick="jQuery('#page-comment-form h4').first().trigger('click')"><%= _('Post a comment') %></a></p>
   <% end %>
+
   <ul class="article-comments-list">
     <%= render :partial => 'comment', :collection => @comments %>
   </ul>
-  <div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
-  <script type="text/javascript">
-  jQuery( function() {
-    jQuery('.article-comment').live('mouseover', function() { jQuery(this).find('.icon-delete:first').show(); });
-    jQuery('.article-comment').live('mouseout', function() { jQuery(this).find('.icon-delete').hide(); });
-  });
-  </script>
+
+  <% if @page.accept_comments? %>
+    <div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
+    <script type="text/javascript">
+      jQuery( function() {
+        jQuery('.article-comment').live('mouseover', function() { jQuery(this).find('.icon-delete:first').show(); });
+        jQuery('.article-comment').live('mouseout', function() { jQuery(this).find('.icon-delete').hide(); });
+      });
+    </script>
   <% end %>
 </div><!-- end class="comments" -->
 
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index 0ba1cd9..104c2e1 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -436,6 +436,14 @@ class ContentViewerControllerTest < ActionController::TestCase
     end
   end
 
+  should 'list comments if article has them, even if new comments are not allowed' do
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text', :accept_comments => false)
+    page.comments.create!(:author => profile, :title => 'list my comment', :body => 'foo bar baz')
+    get :view_page, :profile => profile.identifier, :page => ['myarticle']
+
+    assert_tag :content => /list my comment/
+  end
+
   should 'show link to publication on view' do
     page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
     login_as(profile.identifier)
--
libgit2 0.21.2