diff --git a/Changelog.md b/Changelog.md
index f2aaee042..b8693d599 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -131,6 +131,7 @@ Contributions are very welcome, the hard work is done!
 * Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
 
 ## Features
+* Added the footer to conversation pages
 
 # 0.5.7.0
 
diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index b4fb495d4..f1266f3ad 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,7 +1,5 @@
 class ConversationsController < ApplicationController
   before_action :authenticate_user!
-
-  layout ->(c) { request.format == :mobile ? "application" : "with_header" }
   respond_to :html, :mobile, :json, :js
 
   def index