diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index d441dc9d7f4c4a87e7723b831b23645c1057ca22..a985ccdbdc926b64a50a9917f5028cc5ca11e39c 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -4,8 +4,13 @@
 
 = markdownify(post.message, :youtube_maps => post[:youtube_titles])
 
-- if photos.count > 0
+- if photos.size > 0
   .photo_attachments
-    - for photo in photos
-      = link_to (image_tag photo.url(:thumb_medium)), photo_path(photo)
-
+    = link_to (image_tag photos.first.url(:scaled_full)), photo_path(photos.first)
+    - if photos.size > 1
+      - if photos.size >= 8
+        - for photo in photos[1..8]
+          = link_to (image_tag photo.url(:thumb_small)), photo_path(photo)
+      - else
+        - for photo in photos[1..photos.size]
+          = link_to (image_tag photo.url(:thumb_small)), photo_path(photo)
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index d1bfdf2c3c6e3365cd115766bff17df4e9ae1484..f140565b7ff98316e414018d1ab6ea4471d5a05b 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -372,7 +372,8 @@ header
 
       img
         :margin
-          :right 0.5em
+          :right 0
+        :max-width 100%
 
     .stream_photo
       :float left