diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index c467cbea6..a7a568b21 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -2,7 +2,11 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= markdownify(post.message)
-%br
-- for photo in post.photos
-  = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
+%p
+  = markdownify(post.message)
+
+- if post.photos.count > 0
+  .photo_attachments
+    - for photo in post.photos
+      = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
+
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index b849fe409..6d2c1da45 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -349,6 +349,14 @@ li.message
       :weight normal
       :size 14px
 
+    p
+      :margin
+        :bottom 0
+
+    .photo_attachments
+      :margin
+        :top 7px
+
     .stream_photo
       :float left
       :margin 
@@ -1934,19 +1942,4 @@ h3,h4
     :-webkit-border-radius 5px
     :-moz-border-radius 5px
     :border-radius 5px
-#why
-  :margin
-    :bottom 30px
-  p
-    :text-align justify
-    :padding 1em
 
-#info_links
-  :margin
-    :top 30px
-
-  h3
-    :border #eee 4px solid
-    :border-radius 5px
-    :background-color #ddd
-    :padding 5px