diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 214f88964..f14873e75 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -21,7 +21,10 @@
     = f.hidden_field( :public, :value => false )
   
     .buttons
-      = f.submit t('.share')
+      - if @aspect == :all
+        = f.submit t('.share'), :title => "Share with all aspects"
+      - else
+        = f.submit t('.share'), :title => "Share with #{@aspect.name}"
       - if defined? broadcast
-        = f.submit "Broadcast", :class => "broadcast", :name => "broadcast"
+        = f.submit "Broadcast", :class => "broadcast", :name => "broadcast", :title => "Publish to Diaspora and Facebook"
 
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 474548fe3..4155a593d 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -72,7 +72,7 @@ $.fn.clearForm = function() {
 
 $("#publisher .broadcast").live("click", function(evt){
   evt.preventDefault();
-  if( confirm("Broadcast to the world?") ) {
+  if( confirm("Publish to Diaspora and Facebook?") ) {
     $("#status_message_public").val("true");
     $(this).submit();
   }