diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index 2d8243d1b..efc075089 100644
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -2,7 +2,7 @@
   <%= render :partial => "diary_entry_heading", :object => diary_entry, :as => "diary_entry" %>
 
   <div class="richtext text-break" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
-    <%= diary_entry.body.to_html %>
+    <%= truncated ? diary_entry.body.to_html(2000) : diary_entry.body.to_html %>
   </div>
 
   <% if diary_entry.latitude and diary_entry.longitude %>
@@ -12,6 +12,7 @@
   <nav class='secondary-actions'>
     <ul class='clearfix'>
       <% if params[:action] == 'index' %>
+        <li><%= link_to t(".full_entry"), diary_entry_path(diary_entry.user, diary_entry) %></li>
         <li><%= link_to t(".comment_link"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "newcomment") %></li>
         <li><%= link_to t(".reply_link"), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
         <li>
diff --git a/app/views/diary_entries/_page.html.erb b/app/views/diary_entries/_page.html.erb
index c44a5417e..9cba05d20 100644
--- a/app/views/diary_entries/_page.html.erb
+++ b/app/views/diary_entries/_page.html.erb
@@ -1,7 +1,7 @@
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <h4><%= t ".recent_entries" %></h4>
 
-  <%= render @entries %>
+  <%= render @entries, :truncated => true %>
 
   <%= render "shared/pagination",
              :newer_id => @newer_entries_id,
diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 9e3e7da65..c83189099 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -14,7 +14,7 @@
   </div>
 <% end %>
 
-<%= render @entry %>
+<%= render @entry, :truncated => false %>
 <%= social_share_buttons(:title => @entry.title, :url => diary_entry_url(@entry.user, @entry)) %>
 
 <div id="comments" class="comments mb-3 overflow-hidden">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d1faa7a50..844236c36 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -594,6 +594,7 @@ en:
     diary_entry:
       posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}."
       updated_at_html: "Last updated on %{updated}."
+      full_entry: See full entry
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index bdf9c37ca..75f829e88 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -65,6 +65,32 @@ module RichText
 
     protected
 
+    def truncate_html(html_doc, max_length = nil, empty_tag_length = 1000)
+      return html_doc if max_length.nil?
+
+      doc = Nokogiri::HTML::DocumentFragment.parse(html_doc)
+      accumulated_length = 0
+      last_child = nil
+
+      doc.traverse do |node|
+        if accumulated_length >= max_length
+          node.remove unless !last_child.nil? && last_child.ancestors.include?(node)
+          next
+        end
+
+        next unless node.children.empty?
+
+        accumulated_length += node.text? ? node.text.length : empty_tag_length
+        if accumulated_length < max_length
+          last_child = node
+        else
+          node.remove
+        end
+      end
+
+      doc
+    end
+
     def simple_format(text)
       SimpleFormat.new.simple_format(text)
     end
@@ -83,8 +109,8 @@ module RichText
   end
 
   class HTML < Base
-    def to_html
-      linkify(sanitize(simple_format(self)))
+    def to_html(truncation_length = nil)
+      linkify(sanitize(truncate_html(simple_format(self), truncation_length)))
     end
 
     def to_text
@@ -93,8 +119,8 @@ module RichText
   end
 
   class Markdown < Base
-    def to_html
-      linkify(sanitize(document.to_html), :all)
+    def to_html(truncation_length = nil)
+      linkify(sanitize(truncate_html(document.to_html, truncation_length)), :all)
     end
 
     def to_text
@@ -173,8 +199,8 @@ module RichText
   end
 
   class Text < Base
-    def to_html
-      linkify(simple_format(ERB::Util.html_escape(self)))
+    def to_html(truncation_length = nil)
+      linkify(sanitize(truncate_html(simple_format(ERB::Util.html_escape(self)), truncation_length)))
     end
 
     def to_text
diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index ba091c538..8126e3a13 100644
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -74,4 +74,31 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     assert_link "Diary Entries in Portuguese", :href => "/diary/pt"
     assert_no_link "Diary Entries in Russian"
   end
+
+  test "should not be hidden on the list page" do
+    body = SecureRandom.alphanumeric(1999)
+    create(:diary_entry, :body => body)
+
+    visit diary_entries_path
+
+    assert_content body
+  end
+
+  test "should be hidden on the list page" do
+    body = SecureRandom.alphanumeric(2001)
+    create(:diary_entry, :body => body)
+
+    visit diary_entries_path
+
+    assert_no_content body
+  end
+
+  test "should not be hidden on the show page" do
+    body = SecureRandom.alphanumeric(2001)
+    diary_entry = create(:diary_entry, :body => body)
+
+    visit diary_entry_path(diary_entry.user, diary_entry)
+
+    assert_content body
+  end
 end