diff --git a/app/controllers/friends_controller.rb b/app/controllers/friends_controller.rb
index e6ce8f36b..55778861f 100644
--- a/app/controllers/friends_controller.rb
+++ b/app/controllers/friends_controller.rb
@@ -7,7 +7,6 @@ class FriendsController < ApplicationController
   
   def show
     @friend = Friend.first(:conditions=> {:id => params[:id]})
-    @friend_posts = @friend.posts
   end
   
   def destroy
diff --git a/app/views/friends/show.html.haml b/app/views/friends/show.html.haml
index d13562f8d..8ca7c8c57 100644
--- a/app/views/friends/show.html.haml
+++ b/app/views/friends/show.html.haml
@@ -1,8 +1,11 @@
-  %h1= "#{@friend.real_name}'s network stream"
+%h1= "#{@friend.real_name}'s network stream"
 
-  - if @posts
-    %ul#stream
-      - for post in @posts
-        = render type_partial(post), :post => post
-  - else
-    %h3 no posts to display!
+
+
+
+- if @friend.posts
+  %ul#stream
+    - for post in @friend.posts
+      = render type_partial(post), :post => post
+- else
+  %h3 no posts to display!
diff --git a/spec/controllers/friends_controller_spec.rb b/spec/controllers/friends_controller_spec.rb
index 4abbbede7..57d6e87df 100644
--- a/spec/controllers/friends_controller_spec.rb
+++ b/spec/controllers/friends_controller_spec.rb
@@ -5,6 +5,7 @@ describe FriendsController do
   before do
     #TODO(dan) Mocking Warden; this is a temp fix
     request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user)
+    Factory.create(:user)
     @friend = Factory.build(:friend)
   end
   
@@ -48,5 +49,12 @@ describe FriendsController do
   
   it 'should have test that a delete removes a friend from the database' do
   end
+
+  it 'should display a list of a friends posts on their page' do
+    friend = Factory.create(:friend)
+    @status_message = Factory.create(:status_message, :person => friend)
+    get :show, :id => friend.id
+    response.body.should include @status_message.message
+  end
   
 end