diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index 39281266f..bfcb82c02 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -27,7 +27,7 @@
 
             #publisher-images
               %span.markdownIndications
-                != t('.formatWithMarkdown', link: link_to('markdown', 'https://diasporafoundation.org/formatting'))
+                != t('.formatWithMarkdown', markdown_link: link_to(t('help.markdown'), 'https://diasporafoundation.org/formatting', target: :blank))
               #locator.btn{:title => t('.get_location')}
                 = image_tag 'icons/marker.png', :alt => t('.get_location').titleize, :class => 'publisher_image'
               #file-upload.btn{:title => t('.upload_photos')}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 149a53b75..22036d06d 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -992,7 +992,7 @@ en:
         one: "In %{count} aspect"
         other: "In %{count} aspects"
     publisher:
-      formatWithMarkdown: "You can use %{link} to format your post"
+      formatWithMarkdown: "You can use %{markdown_link} to format your post"
       posting: "Posting..."
       share: "Share"
       preview: "Preview"
diff --git a/features/desktop/posts_from_main_page.feature b/features/desktop/posts_from_main_page.feature
index ea528a40c..e68434f05 100644
--- a/features/desktop/posts_from_main_page.feature
+++ b/features/desktop/posts_from_main_page.feature
@@ -17,6 +17,14 @@ Feature: posting from the main page
       And I have user with username "alice" in an aspect called "PostingTo"
       And I have user with username "alice" in an aspect called "NotPostingThingsHere"
       And I am on the home page
+      
+    Scenario: expanding the publisher
+      Given ".markdownIndications" is hidden
+      And ".options_and_submit" is hidden
+      When I expand the publisher
+      Then I should see "You can use Markdown to format your post" within "#publisher-images"
+      Then I should see "All Aspects" within ".options_and_submit"
+      Then I should see "Preview" within ".options_and_submit"
 
     Scenario: post a text-only message to all aspects
       Given I expand the publisher
diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
index d1fe7ddf5..abfc4b30a 100644
--- a/features/step_definitions/custom_web_steps.rb
+++ b/features/step_definitions/custom_web_steps.rb
@@ -267,3 +267,8 @@ end
 Then /^I should see the Bitcoin address$/ do
   find("#bitcoin_address")['value'].should == "AAAAAA"
 end
+
+Given /^"([^"]*)" is hidden$/ do |selector|
+  page.should have_selector(selector, visible: false)
+  page.should_not have_selector(selector)
+end