diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 59bab4f89..c727f32fc 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -18,9 +18,12 @@
 
 = render 'shared/publisher', :aspect => aspect, :aspect_ids => aspect_ids
 
-- if current_user.contacts.size < 2
+- if posts.length == 0
   = render 'aspects/no_posts_message'
 
+- if current_user.contacts.size < 2
+  = render 'aspects/no_contacts_message'
+
 #main_stream.stream{:data => {:guids => aspect_ids.join(',')}}
   - if posts.length > 0
     = render 'shared/stream', :posts => posts
diff --git a/app/views/aspects/_no_contacts_message.haml b/app/views/aspects/_no_contacts_message.haml
new file mode 100644
index 000000000..051f2f94e
--- /dev/null
+++ b/app/views/aspects/_no_contacts_message.haml
@@ -0,0 +1,11 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+#no_contacts.empty_message
+  = t('.you_should_add_some_more_contacts')
+  %br
+  %br
+  = t('.try_adding_some_more_contacts')
+  != t('.or_featured', :link => link_to(t(".featured_users") , featured_users_path))
+
diff --git a/app/views/aspects/_no_posts_message.haml b/app/views/aspects/_no_posts_message.haml
index 051f2f94e..3891b99b4 100644
--- a/app/views/aspects/_no_posts_message.haml
+++ b/app/views/aspects/_no_posts_message.haml
@@ -2,10 +2,5 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-#no_contacts.empty_message
-  = t('.you_should_add_some_more_contacts')
-  %br
-  %br
-  = t('.try_adding_some_more_contacts')
-  != t('.or_featured', :link => link_to(t(".featured_users") , featured_users_path))
-
+#no_posts.empty_message
+  = t('.start_talking')
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index e0a1ee116..e46ecb82a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -111,6 +111,7 @@ en:
       edit_aspect: "edit aspect"
     no_posts_message:
       start_talking: "Nobody has said anything yet!"
+    no_contacts_message:
       you_should_add_some_more_contacts: "You should add some more contacts!"
       try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
       or_featured:  "Or you can share with %{link}"