diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index bcb23eaf7..34f22e38c 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -7,13 +7,14 @@
     $(".question_mark").tipsy({trigger: 'hover', gravity: 'w'});
   });
 
-#publisher
+#publisher.mention_popup
 
   #click_to_share
-    = image_tag 'icons/doc_edit.png'
-    %span= t('.whats_on_your_mind')
+    -unless aspect == :profile
+      = image_tag 'icons/doc_edit.png'
+      %span= t('.whats_on_your_mind')
 
-    = t('aspects', :count => aspect_ids.length)
+      = t('aspects', :count => aspect_ids.length)
 
   .content_creation
     = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status|
@@ -50,7 +51,7 @@
 
         .public_toggle
           %span#publisher_service_icons
-            - if aspect == :all
+            - if aspect == :all || :profile
               = status.hidden_field( :public)
               = image_tag "social_media_logos/feed-16x16.png", :title => "RSS", :class => 'public_icon dim'
             - if current_user.services
diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml
index 5fc3d362e..821bb7afb 100644
--- a/app/views/status_messages/new.haml
+++ b/app/views/status_messages/new.haml
@@ -10,13 +10,14 @@
     {
       var person = {name: '#{@person.name}', handle: '#{@person.diaspora_handle}' };
       Publisher.autocompletion.onSelect($("#status_message_fake_text"),person,'#{@person.name}');
+      $("#publisher #status_message_fake_text").val(function(index, value){ return value + " " });
       $("#publisher #status_message_submit.button").click(function(){$.facebox.close();});
     });
 
 #new_status_message_pane
-  .span-15
+  .span-15.last
     #facebox_header
       %h4
-        = t('mentioning') + @person.name
+        = t('.mentioning') + @person.name
 
     = render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 80cefb7d9..dec5f54fc 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -538,7 +538,7 @@ en:
       cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
 
   status_messages:
-    new_status_message:
+    new:
       mentioning: "Mentioning: "
     show:
       destroy: "Delete"
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 8ae7b603b..758eac5c6 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -848,6 +848,15 @@ label
   :border
     :bottom 2px #777 solid
 
+  &.mention_popup
+
+    :padding 1px 12px
+    :margin
+      :bottom 0
+    :border
+      :bottom none
+
+
   &.closed
     .options_and_submit
       :display none !important