diff --git a/Changelog.md b/Changelog.md
index d78a0dd8e..f8dc57214 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -57,6 +57,8 @@
 * Add possibility to ask for Bitcoin donations [#4375](https://github.com/diaspora/diaspora/pull/4375)
 * Remove posts, comments and private conversations from the mobile site. [#4408](https://github.com/diaspora/diaspora/pull/4408) [#4409](https://github.com/diaspora/diaspora/pull/4409)
 * Added a link to user photos and thumbnails are shown in the left side bar [#4347](https://github.com/diaspora/diaspora/issues/4347)
+=======
+* Rework the single post view
 
 # 0.1.1.0
 
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
index f3eea7d72..494c20190 100644
--- a/app/assets/stylesheets/header.css.scss
+++ b/app/assets/stylesheets/header.css.scss
@@ -1,3 +1,5 @@
+body > #container { margin-top: 50px; } /* to avoid being hidden under the header in the SPV */
+
 body > header {
   @include box-shadow(0,1px,3px,rgba(0,0,0,0.9));
   background: url('header-bg.png') rgb(40,35,35);
diff --git a/app/assets/templates/post-viewer_tpl.jst.hbs b/app/assets/templates/post-viewer_tpl.jst.hbs
index 8301ac213..dada78ec9 100644
--- a/app/assets/templates/post-viewer_tpl.jst.hbs
+++ b/app/assets/templates/post-viewer_tpl.jst.hbs
@@ -1,16 +1,4 @@
 <div id="author-info"></div>
-
-<div id="top-right-nav">
-    <a href="/" id="home-button">
-        <span class="label label-inverse">
-            <i class="icon-home icon-white"></i>
-            <span>
-                {{t "viewer.home"}}
-            </span>
-        </span>
-    </a>
-</div>
-
-<div id="post-content"> </div>
-<div id="post-nav"> </div>
-<div id="post-interactions"> </div>
+<div id="post-content"></div>
+<div id="post-nav"></div>
+<div id="post-interactions"></div>
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 10c579337..9911e251c 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -9,7 +9,7 @@ class PostsController < ApplicationController
   before_filter :set_format_if_malformed_from_status_net, :only => :show
   before_filter :find_post, :only => [:show, :next, :previous, :interactions]
 
-  layout 'application'
+  layout 'with_header'
   before_filter -> { @css_framework = :bootstrap }
 
   respond_to :html,