diff --git a/Changelog.md b/Changelog.md
index cee93ef66e1f9fba8c0f69ddf206ab4890425dd7..eb8b1c8d3c7da985dd3dc2dc2a71c832737bd6f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -49,6 +49,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
 * Improve accessibility of a couple pages [#6227](https://github.com/diaspora/diaspora/pull/6227)
 * Capitalize "Powered by diaspora" [#6254](https://github.com/diaspora/diaspora/pull/6254)
+* Display username and avatar for NSFW posts in mobile view [#6245](https://github.com/diaspora/diaspora/6245)
 
 ## Features
 * Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)
diff --git a/app/assets/javascripts/mobile/mobile.js b/app/assets/javascripts/mobile/mobile.js
index e7ba23e415c76e9c56831ea529ca34004d73fb6e..0a00b723b5c637e35af33e63c70ce3469f858aff 100644
--- a/app/assets/javascripts/mobile/mobile.js
+++ b/app/assets/javascripts/mobile/mobile.js
@@ -24,7 +24,7 @@
 $(document).ready(function(){
 
   $('.shield a').click(function(){
-    $(this).parents('.shield_wrapper').remove();
+    $(this).parents(".stream_element").removeClass("shield-active");
     return false;
   });
   var showLoader = function(link){
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 30a9abc0fc416700c1d7403f5d289ced34e0b8f4..b4e4e87a077058e2f58a2f0b81c6f6daeb2f1a0e 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -77,20 +77,28 @@ h3 {  margin-top: 0; }
   .photo_attachments{ margin-top: 6px; }
   .timeago{ font-weight: normal; }
 }
+
 .shield{
   padding: 10px;
   font-size: larger;
 }
 
-.shield_wrapper{
+.nsfw-shield{
     height: 100%;
     width: 100%;
     background-color: LightGrey;
-    position: absolute;
-    border-radius: 5px;
+    border-radius: 0;
     z-index: 2;
 }
 
+.stream_element:not(.shield-active) .shield{
+  display: none;
+}
+
+.stream_element.shield-active .nsfw-hidden{
+  display: none;
+}
+
 .new_comment {
   padding: 10px;
 }
@@ -571,10 +579,10 @@ select {
   .reshare_via {
     width: 100%;
     position: absolute;
-    bottom: -7px;
+    bottom: -10px;
     text-align: center;
     span {
-      padding: 2px 10px;
+      padding: 0 10px;
       font-weight: bold;
       color: $text-grey;
       background: {
diff --git a/app/views/reshares/_reshare.mobile.haml b/app/views/reshares/_reshare.mobile.haml
index 36ee8c2e6b4f88ab0a1e06df1ee65885e7da4869..16d0934689e5c258c0da749436990a66fc17110a 100644
--- a/app/views/reshares/_reshare.mobile.haml
+++ b/app/views/reshares/_reshare.mobile.haml
@@ -4,17 +4,22 @@
 
 .reshare
   - if post
-    = render 'shared/photo_area', :post => post
+    .nsfw-hidden
+      = render "shared/photo_area", post: post
 
     .content
-      = render 'shared/post_info', :post => post
+      = render "shared/post_info", post: post
+
+    - unless post.is_a?(Reshare)
+      = render "shared/nsfw_shield", post: post
 
       - if !post.activity_streams?
-        = render 'status_messages/status_message', :post => post, :photos => post.photos
+        .nsfw-hidden
+          = render "status_messages/status_message", post: post, photos: post.photos
   - else
     .content
-      = t('.deleted')
+      = t(".deleted")
 
   .reshare_via
     %span
-      = t('.reshared_via')
+      = t(".reshared_via")
diff --git a/app/views/shared/_nsfw_shield.mobile.haml b/app/views/shared/_nsfw_shield.mobile.haml
new file mode 100644
index 0000000000000000000000000000000000000000..6fa3eb4e5a00551f7cea79a6028d12a9c3b2e863
--- /dev/null
+++ b/app/views/shared/_nsfw_shield.mobile.haml
@@ -0,0 +1,6 @@
+- if post.respond_to?(:nsfw) && post.nsfw
+  .nsfw-shield
+    .shield
+      %strong #NSFW
+      |
+      = link_to t("javascripts.stream.show_nsfw_post"), "#", class: "toggle_nsfw_state"
diff --git a/app/views/shared/_post_info.mobile.haml b/app/views/shared/_post_info.mobile.haml
index 03d6aa5041ff37184d0db57620b2687394748d28..174b91b11df8713831266738441bf56810dd7949 100644
--- a/app/views/shared/_post_info.mobile.haml
+++ b/app/views/shared/_post_info.mobile.haml
@@ -31,5 +31,5 @@
         - else
           = t('limited')
     - if !post.is_a?(Reshare) and post.location
-      .location
+      .location.nsfw-hidden
         = t("posts.show.location", location: post.location.address)
diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index eda9c75ab556787606b756b8fef6e71ba07a60d0..778384320c27bdcdde1bd561b80b7d3346dc1435 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -2,26 +2,24 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-.stream_element{data: {guid: post.id}}
-  - if post.respond_to?(:nsfw) && post.nsfw
-    .shield_wrapper
-      .shield
-        %strong #NSFW 
-        | 
-        = link_to t("javascripts.stream.show_nsfw_post"), "#"
-  
+.stream_element{data: {guid: post.id}, class: post.respond_to?(:nsfw) && post.nsfw ? "shield-active" : ""}
   - if post.is_a?(Reshare)
     = render "reshares/reshare", reshare: post, post: post.absolute_root
 
-  = render "shared/photo_area", post: post
+  .nsfw-hidden
+    = render "shared/photo_area", post: post
 
   .content
     = render "shared/post_info", post: post
 
+  - unless post.is_a?(Reshare)
+    = render "shared/nsfw_shield", post: post
+
+  .nsfw-hidden
     - if post.is_a?(StatusMessage)
       = render "status_messages/status_message", post: post, photos: post.photos
 
-  .bottom_bar
+  .bottom_bar.nsfw-hidden
     .floater
       = mobile_reshare_icon(post)
       = mobile_comment_icon(post)
@@ -31,4 +29,3 @@
 
     - if defined?(expanded_info) && expanded_info
       = render partial: "shared/post_stats", locals: {post: @post}
-
diff --git a/features/mobile/not_safe_for_work.feature b/features/mobile/not_safe_for_work.feature
new file mode 100644
index 0000000000000000000000000000000000000000..bbebf8e870ab1d53e62c8cdc637556f9995e63fd
--- /dev/null
+++ b/features/mobile/not_safe_for_work.feature
@@ -0,0 +1,71 @@
+@javascript @mobile
+Feature: Not safe for work
+  Background:
+    Given a nsfw user with email "tommy@nsfw.example.com"
+    And a user with email "laura@office.example.com"
+    And a user with email "laura@office.example.com" is connected with "tommy@nsfw.example.com"
+
+  Scenario: Setting not safe for work
+
+    And I sign in as "tommy@nsfw.example.com"
+    When I go to the edit profile page
+    And I mark myself as not safe for work
+    And I submit the form
+    Then I should be on the edit profile page
+    And the "profile[nsfw]" checkbox should be checked
+    When I go to the edit profile page
+    And I mark myself as safe for work
+    And I submit the form
+    Then I should be on the edit profile page
+    And the "profile[nsfw]" checkbox should not be checked
+
+  Scenario: Toggling nsfw state
+    #Nsfw users posts are marked nsfw
+    And "tommy@nsfw.example.com" has a public post with text "I love 0bj3ction4bl3 c0nt3nt!" and a poll
+    And "tommy@nsfw.example.com" has a public post with text "I love 0bj3ction4bl3 c0nt3nt!" and a location
+    And "tommy@nsfw.example.com" has a public post with text "I love 0bj3ction4bl3 c0nt3nt!" and a picture
+
+    #toggling nsfw state
+    When I sign in as "laura@office.example.com"
+    Then I should not see "I love 0bj3ction4bl3 c0nt3nt!"
+    And I should not see "What do you think about 1 ninjas?"
+    And I should not see "Posted from:"
+    And I should not see any picture in my stream
+    When I toggle all nsfw posts
+    Then I should see "I love 0bj3ction4bl3 c0nt3nt!"
+    And I should see "What do you think about 1 ninjas?"
+    And I should see "Posted from:"
+    And I should see 1 pictures in my stream
+
+  Scenario: Resharing a nsfw post with poll
+    And "tommy@nsfw.example.com" has a public post with text "Sexy Senators Gone Wild!" and a poll
+    And I sign in as "laura@office.example.com"
+    And I toggle all nsfw posts
+    And I follow "Reshare"
+    And I confirm the alert
+    And I go to the home page
+    Then I should not see "Sexy Senators Gone Wild!"
+    And I should not see "What do you think about 1 ninjas?"
+    And I should have 2 nsfw posts
+
+  Scenario: Resharing a nsfw post with location
+    And "tommy@nsfw.example.com" has a public post with text "Sexy Senators Gone Wild!" and a location
+    And I sign in as "laura@office.example.com"
+    And I toggle all nsfw posts
+    And I follow "Reshare"
+    And I confirm the alert
+    And I go to the home page
+    Then I should not see "Sexy Senators Gone Wild!"
+    And I should not see "Posted from:"
+    And I should have 2 nsfw posts
+
+  Scenario: Resharing a nsfw post with picture
+    And "tommy@nsfw.example.com" has a public post with text "Sexy Senators Gone Wild!" and a picture
+    And I sign in as "laura@office.example.com"
+    And I toggle all nsfw posts
+    And I follow "Reshare"
+    And I confirm the alert
+    And I go to the home page
+    Then I should not see "Sexy Senators Gone Wild!"
+    And I should not see any picture in my stream
+    And I should have 2 nsfw posts
diff --git a/features/step_definitions/posts_steps.rb b/features/step_definitions/posts_steps.rb
index 10c04b8abcbbe91312c9cd53171d9e331a4c6a37..1a0d22e5a8058a192ef97fac9d4cf97dafa84a36 100644
--- a/features/step_definitions/posts_steps.rb
+++ b/features/step_definitions/posts_steps.rb
@@ -18,6 +18,14 @@ Then /^I should not see any posts in my stream$/ do
   page.assert_selector(".stream_element", count: 0)
 end
 
+Then /^I should not see any picture in my stream$/ do
+  expect(page).to have_selector(".photo_area img", count: 0)
+end
+
+Then /^I should see (\d+) pictures in my stream$/ do |count|
+  expect(page).to have_selector(".photo_area img", count: count)
+end
+
 Then /^I should not be able to submit the publisher$/ do
   expect(publisher_submittable?).to be false
 end
@@ -27,6 +35,24 @@ Given /^"([^"]*)" has a public post with text "([^"]*)"$/ do |email, text|
   user.post(:status_message, :text => text, :public => true, :to => user.aspect_ids)
 end
 
+Given /^"([^"]*)" has a public post with text "([^"]*)" and a poll$/ do |email, text|
+  user = User.find_by(email: email)
+  post = user.post(:status_message, text: text, public: true, to: user.aspect_ids)
+  FactoryGirl.create(:poll, status_message: post)
+end
+
+Given /^"([^"]*)" has a public post with text "([^"]*)" and a location$/ do |email, text|
+  user = User.find_by(email: email)
+  post = user.post(:status_message, text: text, public: true, to: user.aspect_ids)
+  FactoryGirl.create(:location, status_message: post)
+end
+
+Given /^"([^"]*)" has a public post with text "([^"]*)" and a picture/ do |email, text|
+  user = User.find_by(email: email)
+  post = user.post(:status_message, text: text, public: true, to: user.aspect_ids)
+  FactoryGirl.create(:photo, status_message: post)
+end
+
 Given /^there are (\d+) public posts from "([^"]*)"$/ do |n_posts, email|
   user = User.find_by_email(email)
   (1..n_posts.to_i).each do |n|
diff --git a/features/step_definitions/stream_steps.rb b/features/step_definitions/stream_steps.rb
index 9e38191e5c81cbcb5a41cc286b29bbcf3641e4c4..830d9de8276be6d84a38bd577371b00ee1d0118c 100644
--- a/features/step_definitions/stream_steps.rb
+++ b/features/step_definitions/stream_steps.rb
@@ -14,6 +14,10 @@ When /^I toggle nsfw posts$/ do
   find(".toggle_nsfw_state", match: :first).click
 end
 
+When /^I toggle all nsfw posts$/ do
+  all("a.toggle_nsfw_state").each &:click
+end
+
 Then /^I should have (\d+) nsfw posts$/ do |num_posts|
   page.should have_css(".nsfw-shield", count: num_posts.to_i)
 end
diff --git a/spec/integration/mobile_posts_spec.rb b/spec/integration/mobile_posts_spec.rb
index d743e61f7356f52585ecdc1de0ea1ce397f8fba6..54cc2e60c884241ab277141dc5ddb6396c087d44 100644
--- a/spec/integration/mobile_posts_spec.rb
+++ b/spec/integration/mobile_posts_spec.rb
@@ -29,7 +29,7 @@ describe PostsController, type: :request do
       get "/posts/#{sm.id}", format: :mobile
 
       expect(response.status).to eq(200)
-      expect(response.body).to match(/div class='location'/)
+      expect(response.body).to match(/'location nsfw-hidden'/)
       expect(response.body).to match(/#{I18n.t("posts.show.location", location: sm.location.address)}/)
     end
   end