diff --git a/Changelog.md b/Changelog.md
index f4b751853..264ba783e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,7 @@
 * Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280)
 * Do not add a space after adding a mention [#4767](https://github.com/diaspora/diaspora/issues/4767)
 * Fix active user statistics by saving a last seen timestamp for users [#4734](https://github.com/diaspora/diaspora/issues/4734)
+* Render HTML in atom user feed [#4835](https://github.com/diaspora/diaspora/pull/4835)
 
 ## Features
 * You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517)
diff --git a/app/views/users/public.atom.builder b/app/views/users/public.atom.builder
index c540c9186..2f09148fa 100644
--- a/app/views/users/public.atom.builder
+++ b/app/views/users/public.atom.builder
@@ -32,8 +32,8 @@ atom_feed({'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
     feed.entry post, :url => "#{@user.url}p/#{post.id}",
       :id => "#{@user.url}p/#{post.id}" do |entry|
 
-      entry.title truncate(post.formatted_message(:plain_text => true), :length => 50)
-      entry.content auto_link(post.formatted_message(:plain_text => true)), :type => 'html'
+      entry.title post_page_title(post)
+      entry.content markdownify(post), :type => 'html'
       entry.tag! 'activity:verb', 'http://activitystrea.ms/schema/1.0/post'
       entry.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/note'
     end