diff --git a/app/models/article_block.rb b/app/models/article_block.rb
index 6104384..8324bc4 100644
--- a/app/models/article_block.rb
+++ b/app/models/article_block.rb
@@ -21,12 +21,7 @@ class ArticleBlock < Block
   def content(args={})
     block = self
     proc do
-      block_title(block.title) +
-      (block.article ? article_to_html(FilePresenter.for(block.article),
-          :gallery_view => false,
-          :inside_block => block,               # For Blogs and folders
-          :format => block.visualization_format # For Articles and contents
-        ).html_safe : _('Article not selected yet.'))
+      render :file => 'blocks/article', :locals => { :block => block }
     end
   end
 
diff --git a/app/models/disabled_enterprise_message_block.rb b/app/models/disabled_enterprise_message_block.rb
index be9b29c..f3f217d 100644
--- a/app/models/disabled_enterprise_message_block.rb
+++ b/app/models/disabled_enterprise_message_block.rb
@@ -13,9 +13,9 @@ class DisabledEnterpriseMessageBlock < Block
   end
 
   def content(args={})
-    message = self.owner.environment.message_for_disabled_enterprise || ''
+    block = self
     lambda do |_|
-       render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
+       render :file => 'blocks/disabled_enterprise_message', :locals => { :block => block }
     end
   end
 
diff --git a/app/models/feed_reader_block.rb b/app/models/feed_reader_block.rb
index 8f75f53..0c510ed 100644
--- a/app/models/feed_reader_block.rb
+++ b/app/models/feed_reader_block.rb
@@ -52,16 +52,6 @@ class FeedReaderBlock < Block
     self.feed_title.nil? ? _('Feed Reader') : self.feed_title
   end
 
-  def formatted_feed_content
-    if error_message.blank?
-      "<ul>\n".html_safe +
-      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
-      "</ul>".html_safe
-    else
-      "<p>#{error_message}</p>".html_safe
-    end
-  end
-
   def footer
     if self.fetched_at.nil? or self.feed_items.empty?
       _('Feed content was not loaded yet')
@@ -86,7 +76,6 @@ class FeedReaderBlock < Block
   end
 
   def content(args={})
-    block_title(title) + formatted_feed_content
   end
 
 end
diff --git a/app/views/blocks/article.html.erb b/app/views/blocks/article.html.erb
new file mode 100644
index 0000000..78e8524
--- /dev/null
+++ b/app/views/blocks/article.html.erb
@@ -0,0 +1,12 @@
+<%= block_title(block.title) %>
+<% if block.article %>
+  <%=h
+    article_to_html(FilePresenter.for(block.article),
+        :gallery_view => false,
+        :inside_block => block,               # For Blogs and folders
+        :format => block.visualization_format # For Articles and contents
+    )
+  %>
+<% else %>
+  <%= _('Article not selected yet.') %>
+<% end %>
diff --git a/app/views/blocks/disabled_enterprise_message.html.erb b/app/views/blocks/disabled_enterprise_message.html.erb
index 208fe0c..3ac33e3 100644
--- a/app/views/blocks/disabled_enterprise_message.html.erb
+++ b/app/views/blocks/disabled_enterprise_message.html.erb
@@ -1,3 +1,5 @@
+<% message = block.owner.environment.message_for_disabled_enterprise || '' %>
+
 <div id='enterprise-disabled'>
   <%= message %>
   <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
diff --git a/app/views/blocks/feed_reader.html.erb b/app/views/blocks/feed_reader.html.erb
new file mode 100644
index 0000000..aaa1a1b
--- /dev/null
+++ b/app/views/blocks/feed_reader.html.erb
@@ -0,0 +1,12 @@
+<%= block_title(title) %>
+
+<%
+
+    if error_message.blank?
+      "<ul>\n".html_safe +
+      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
+      "</ul>".html_safe
+    else
+      "<p>#{error_message}</p>".html_safe
+    end
+%>
--
libgit2 0.21.2