diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index a1c434c0a..bd541a011 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -28,31 +28,29 @@
         %params
           #publisher_textarea_wrapper
             %ul#photodropzone
-            = status.text_area :fake_text, :rows => 2, :value => h(params[:prefill])
+            = status.text_area :fake_text, :rows => 2, :value => h(params[:prefill]), :tabindex => 1
             = status.hidden_field :text, :value => '', :class => 'clear_on_submit'
 
       - for aspect_id in aspect_ids
         = hidden_field_tag 'aspect_ids[]', aspect_id.to_s
 
       .options_and_submit
-        .mention_helper
-          - if aspect != :profile
-            %i= t('.mention_helper_text')
-          - else
+        - if aspect == :profile
+          .mention_helper
             .badges
               %i= t('.publishing_to')
               = aspect_badges(aspects_with_person, :link => false)
 
         .public_toggle
           %span#publisher_service_icons
-            = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')#, :style=>"display:none;"
+            = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')
             - if aspect == :all || :profile
               = status.hidden_field( :public)
               = image_tag "icons/globe.png", :title => t('.public'), :class => 'public_icon dim', :width => 16, :height => 16
             - if current_user.services
               - for service in current_user.services
                 = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider, :class => "service_icon dim", :id =>"#{service.provider}"
-          = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button'
+          = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button', :tabindex => 2
 
           .facebox_content
             #question_mark_pane
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 2d1fe2fa9..73b35100f 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -514,7 +514,6 @@ en:
 
   shared:
     publisher:
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       posting: "Posting..."
       share: "Share"
       post_a_message_to: "Post a message to %{aspect}"